From 535f3ca54b4f868a4d0aebacfda5bd748088f5c2 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Sat, 25 Mar 2023 20:46:19 +0100 Subject: [PATCH 01/63] rename folder and pipeline --- .../workflows/ms.desktopvirtualization.applicationgroups.yml | 4 ++-- .../application-groups}/.bicep/nested_roleAssignments.bicep | 0 .../application-groups}/.test/common/dependencies.bicep | 0 .../application-groups}/.test/common/deploy.test.bicep | 0 .../application-groups}/.test/min/dependencies.bicep | 0 .../application-groups}/.test/min/deploy.test.bicep | 0 .../application-groups}/applications/deploy.bicep | 0 .../application-groups}/applications/readme.md | 0 .../application-groups}/applications/version.json | 0 .../application-groups}/deploy.bicep | 0 .../application-groups}/readme.md | 0 .../application-groups}/version.json | 0 .../hostpools/.bicep/nested_roleAssignments.bicep | 0 .../hostpools/.test/common/dependencies.bicep | 0 .../hostpools/.test/common/deploy.test.bicep | 0 .../hostpools/.test/min/deploy.test.bicep | 0 .../hostpools/deploy.bicep | 0 .../hostpools/readme.md | 0 .../hostpools/version.json | 0 .../scalingplans/.bicep/nested_roleAssignments.bicep | 0 .../scalingplans/.test/common/dependencies.bicep | 0 .../scalingplans/.test/common/deploy.test.bicep | 0 .../scalingplans/.test/min/deploy.test.bicep | 0 .../scalingplans/deploy.bicep | 0 .../scalingplans/readme.md | 0 .../scalingplans/version.json | 0 .../workspaces/.bicep/nested_roleAssignments.bicep | 0 .../workspaces/.test/common/dependencies.bicep | 0 .../workspaces/.test/common/deploy.test.bicep | 0 .../workspaces/.test/min/deploy.test.bicep | 0 .../workspaces/deploy.bicep | 0 .../workspaces/readme.md | 0 .../workspaces/version.json | 0 33 files changed, 2 insertions(+), 2 deletions(-) rename modules/{Microsoft.DesktopVirtualization/applicationgroups => desktop-virtualization/application-groups}/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.DesktopVirtualization/applicationgroups => desktop-virtualization/application-groups}/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.DesktopVirtualization/applicationgroups => desktop-virtualization/application-groups}/.test/common/deploy.test.bicep (100%) rename modules/{Microsoft.DesktopVirtualization/applicationgroups => desktop-virtualization/application-groups}/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.DesktopVirtualization/applicationgroups => desktop-virtualization/application-groups}/.test/min/deploy.test.bicep (100%) rename modules/{Microsoft.DesktopVirtualization/applicationgroups => desktop-virtualization/application-groups}/applications/deploy.bicep (100%) rename modules/{Microsoft.DesktopVirtualization/applicationgroups => desktop-virtualization/application-groups}/applications/readme.md (100%) rename modules/{Microsoft.DesktopVirtualization/applicationgroups => desktop-virtualization/application-groups}/applications/version.json (100%) rename modules/{Microsoft.DesktopVirtualization/applicationgroups => desktop-virtualization/application-groups}/deploy.bicep (100%) rename modules/{Microsoft.DesktopVirtualization/applicationgroups => desktop-virtualization/application-groups}/readme.md (100%) rename modules/{Microsoft.DesktopVirtualization/applicationgroups => desktop-virtualization/application-groups}/version.json (100%) rename modules/{Microsoft.DesktopVirtualization => desktop-virtualization}/hostpools/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => desktop-virtualization}/hostpools/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => desktop-virtualization}/hostpools/.test/common/deploy.test.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => desktop-virtualization}/hostpools/.test/min/deploy.test.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => desktop-virtualization}/hostpools/deploy.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => desktop-virtualization}/hostpools/readme.md (100%) rename modules/{Microsoft.DesktopVirtualization => desktop-virtualization}/hostpools/version.json (100%) rename modules/{Microsoft.DesktopVirtualization => desktop-virtualization}/scalingplans/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => desktop-virtualization}/scalingplans/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => desktop-virtualization}/scalingplans/.test/common/deploy.test.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => desktop-virtualization}/scalingplans/.test/min/deploy.test.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => desktop-virtualization}/scalingplans/deploy.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => desktop-virtualization}/scalingplans/readme.md (100%) rename modules/{Microsoft.DesktopVirtualization => desktop-virtualization}/scalingplans/version.json (100%) rename modules/{Microsoft.DesktopVirtualization => desktop-virtualization}/workspaces/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => desktop-virtualization}/workspaces/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => desktop-virtualization}/workspaces/.test/common/deploy.test.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => desktop-virtualization}/workspaces/.test/min/deploy.test.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => desktop-virtualization}/workspaces/deploy.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => desktop-virtualization}/workspaces/readme.md (100%) rename modules/{Microsoft.DesktopVirtualization => desktop-virtualization}/workspaces/version.json (100%) diff --git a/.github/workflows/ms.desktopvirtualization.applicationgroups.yml b/.github/workflows/ms.desktopvirtualization.applicationgroups.yml index bad0a2859a..ee5b3e1620 100644 --- a/.github/workflows/ms.desktopvirtualization.applicationgroups.yml +++ b/.github/workflows/ms.desktopvirtualization.applicationgroups.yml @@ -30,13 +30,13 @@ on: - '.github/actions/templates/**' - '.github/workflows/template.module.yml' - '.github/workflows/ms.desktopvirtualization.applicationgroups.yml' - - 'modules/Microsoft.DesktopVirtualization/applicationgroups/**' + - 'modules/desktop-virtualization/application-groups/**' - 'utilities/pipelines/**' - '!utilities/pipelines/deploymentRemoval/**' - '!*/**/readme.md' env: - modulePath: 'modules/Microsoft.DesktopVirtualization/applicationgroups' + modulePath: 'modules/desktop-virtualization/application-groups' workflowPath: '.github/workflows/ms.desktopvirtualization.applicationgroups.yml' concurrency: diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_roleAssignments.bicep b/modules/desktop-virtualization/application-groups/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_roleAssignments.bicep rename to modules/desktop-virtualization/application-groups/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/common/dependencies.bicep b/modules/desktop-virtualization/application-groups/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/.test/common/dependencies.bicep rename to modules/desktop-virtualization/application-groups/.test/common/dependencies.bicep diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/common/deploy.test.bicep b/modules/desktop-virtualization/application-groups/.test/common/deploy.test.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/.test/common/deploy.test.bicep rename to modules/desktop-virtualization/application-groups/.test/common/deploy.test.bicep diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min/dependencies.bicep b/modules/desktop-virtualization/application-groups/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min/dependencies.bicep rename to modules/desktop-virtualization/application-groups/.test/min/dependencies.bicep diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min/deploy.test.bicep b/modules/desktop-virtualization/application-groups/.test/min/deploy.test.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min/deploy.test.bicep rename to modules/desktop-virtualization/application-groups/.test/min/deploy.test.bicep diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep b/modules/desktop-virtualization/application-groups/applications/deploy.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep rename to modules/desktop-virtualization/application-groups/applications/deploy.bicep diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md b/modules/desktop-virtualization/application-groups/applications/readme.md similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md rename to modules/desktop-virtualization/application-groups/applications/readme.md diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json b/modules/desktop-virtualization/application-groups/applications/version.json similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json rename to modules/desktop-virtualization/application-groups/applications/version.json diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep b/modules/desktop-virtualization/application-groups/deploy.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep rename to modules/desktop-virtualization/application-groups/deploy.bicep diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/readme.md b/modules/desktop-virtualization/application-groups/readme.md similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/readme.md rename to modules/desktop-virtualization/application-groups/readme.md diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/version.json b/modules/desktop-virtualization/application-groups/version.json similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/version.json rename to modules/desktop-virtualization/application-groups/version.json diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_roleAssignments.bicep b/modules/desktop-virtualization/hostpools/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_roleAssignments.bicep rename to modules/desktop-virtualization/hostpools/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/.test/common/dependencies.bicep b/modules/desktop-virtualization/hostpools/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/hostpools/.test/common/dependencies.bicep rename to modules/desktop-virtualization/hostpools/.test/common/dependencies.bicep diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/.test/common/deploy.test.bicep b/modules/desktop-virtualization/hostpools/.test/common/deploy.test.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/hostpools/.test/common/deploy.test.bicep rename to modules/desktop-virtualization/hostpools/.test/common/deploy.test.bicep diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/.test/min/deploy.test.bicep b/modules/desktop-virtualization/hostpools/.test/min/deploy.test.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/hostpools/.test/min/deploy.test.bicep rename to modules/desktop-virtualization/hostpools/.test/min/deploy.test.bicep diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/deploy.bicep b/modules/desktop-virtualization/hostpools/deploy.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/hostpools/deploy.bicep rename to modules/desktop-virtualization/hostpools/deploy.bicep diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/readme.md b/modules/desktop-virtualization/hostpools/readme.md similarity index 100% rename from modules/Microsoft.DesktopVirtualization/hostpools/readme.md rename to modules/desktop-virtualization/hostpools/readme.md diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/version.json b/modules/desktop-virtualization/hostpools/version.json similarity index 100% rename from modules/Microsoft.DesktopVirtualization/hostpools/version.json rename to modules/desktop-virtualization/hostpools/version.json diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_roleAssignments.bicep b/modules/desktop-virtualization/scalingplans/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_roleAssignments.bicep rename to modules/desktop-virtualization/scalingplans/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/.test/common/dependencies.bicep b/modules/desktop-virtualization/scalingplans/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/scalingplans/.test/common/dependencies.bicep rename to modules/desktop-virtualization/scalingplans/.test/common/dependencies.bicep diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/.test/common/deploy.test.bicep b/modules/desktop-virtualization/scalingplans/.test/common/deploy.test.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/scalingplans/.test/common/deploy.test.bicep rename to modules/desktop-virtualization/scalingplans/.test/common/deploy.test.bicep diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/.test/min/deploy.test.bicep b/modules/desktop-virtualization/scalingplans/.test/min/deploy.test.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/scalingplans/.test/min/deploy.test.bicep rename to modules/desktop-virtualization/scalingplans/.test/min/deploy.test.bicep diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/deploy.bicep b/modules/desktop-virtualization/scalingplans/deploy.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/scalingplans/deploy.bicep rename to modules/desktop-virtualization/scalingplans/deploy.bicep diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/readme.md b/modules/desktop-virtualization/scalingplans/readme.md similarity index 100% rename from modules/Microsoft.DesktopVirtualization/scalingplans/readme.md rename to modules/desktop-virtualization/scalingplans/readme.md diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/version.json b/modules/desktop-virtualization/scalingplans/version.json similarity index 100% rename from modules/Microsoft.DesktopVirtualization/scalingplans/version.json rename to modules/desktop-virtualization/scalingplans/version.json diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_roleAssignments.bicep b/modules/desktop-virtualization/workspaces/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_roleAssignments.bicep rename to modules/desktop-virtualization/workspaces/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/dependencies.bicep b/modules/desktop-virtualization/workspaces/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/workspaces/.test/common/dependencies.bicep rename to modules/desktop-virtualization/workspaces/.test/common/dependencies.bicep diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep b/modules/desktop-virtualization/workspaces/.test/common/deploy.test.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep rename to modules/desktop-virtualization/workspaces/.test/common/deploy.test.bicep diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep b/modules/desktop-virtualization/workspaces/.test/min/deploy.test.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep rename to modules/desktop-virtualization/workspaces/.test/min/deploy.test.bicep diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/deploy.bicep b/modules/desktop-virtualization/workspaces/deploy.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/workspaces/deploy.bicep rename to modules/desktop-virtualization/workspaces/deploy.bicep diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/readme.md b/modules/desktop-virtualization/workspaces/readme.md similarity index 100% rename from modules/Microsoft.DesktopVirtualization/workspaces/readme.md rename to modules/desktop-virtualization/workspaces/readme.md diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/version.json b/modules/desktop-virtualization/workspaces/version.json similarity index 100% rename from modules/Microsoft.DesktopVirtualization/workspaces/version.json rename to modules/desktop-virtualization/workspaces/version.json From d765e5bb0b253623574eb1792da13ede5c32acaa Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Sun, 26 Mar 2023 00:43:46 +0100 Subject: [PATCH 02/63] set module readme and readme --- .../application-groups/readme.md | 6 +++--- utilities/tools/Set-ModuleReadMe.ps1 | 11 +++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/modules/desktop-virtualization/application-groups/readme.md b/modules/desktop-virtualization/application-groups/readme.md index 660daf8090..d09b772788 100644 --- a/modules/desktop-virtualization/application-groups/readme.md +++ b/modules/desktop-virtualization/application-groups/readme.md @@ -1,4 +1,4 @@ -# AVD Application Groups `[Microsoft.DesktopVirtualization/applicationgroups]` +# AVD Application Groups `[Microsoft.DesktopVirtualization/applicationGroups]` This module deploys an Azure virtual desktop application group. @@ -178,7 +178,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module applicationgroups './Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep' = { +module applicationGroups './desktop-virtualization/application-groups/deploy.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dvagcom' params: { // Required parameters @@ -335,7 +335,7 @@ module applicationgroups './Microsoft.DesktopVirtualization/applicationgroups/de via Bicep module ```bicep -module applicationgroups './Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep' = { +module applicationGroups './desktop-virtualization/application-groups/deploy.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dvagmin' params: { // Required parameters diff --git a/utilities/tools/Set-ModuleReadMe.ps1 b/utilities/tools/Set-ModuleReadMe.ps1 index 8b7815afc4..0a52426f65 100644 --- a/utilities/tools/Set-ModuleReadMe.ps1 +++ b/utilities/tools/Set-ModuleReadMe.ps1 @@ -928,6 +928,8 @@ function Set-DeploymentExamplesSection { ' >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order.', '' ) + # Get module relative path to provide to module references in Deployment Examples + $moduleRelative = $moduleRoot.Replace('\', '/').split('modules/')[1] # Get resource type and make first letter upper case. Requires manual handling as ToTitleCase lowercases everything but the first letter $providerNamespace = ($fullModuleIdentifier.Split('/')[0] -split '\.' | ForEach-Object { $_.Substring(0, 1).ToUpper() + $_.Substring(1) }) -join '.' @@ -991,7 +993,8 @@ function Set-DeploymentExamplesSection { # [3/6] Format header, remove scope property & any empty line $rawBicepExample = $rawBicepExampleString -split '\n' - $rawBicepExample[0] = "module $resourceType './$FullModuleIdentifier/deploy.bicep' = {" + $rawBicepExample[0] = "module $resourceType './$moduleRelative/deploy.bicep' = {" + # $rawBicepExample[0] = "module $resourceType './$FullModuleIdentifier/deploy.bicep' = {" $rawBicepExample = $rawBicepExample | Where-Object { $_ -notmatch 'scope: *' } | Where-Object { -not [String]::IsNullOrEmpty($_) } # [4/6] Extract param block @@ -1475,7 +1478,11 @@ function Set-ModuleReadMe { } $moduleRoot = Split-Path $TemplateFilePath -Parent - $fullModuleIdentifier = 'Microsoft.{0}' -f $moduleRoot.Replace('\', '/').split('/Microsoft.')[1] + $moduleRelative = $moduleRoot.Replace('\', '/').split('modules/')[1] + $splitHyphens = $moduleRelative.split('-') + $splitHyphens = $splitHyphens | ForEach-Object { $_.substring(0, 1).toupper() + $_.substring(1) } + $splitHyphens = $splitHyphens -join '' + $fullModuleIdentifier = 'Microsoft.{0}' -f $splitHyphens.Replace('-', '') # Check readme if (-not (Test-Path $ReadMeFilePath) -or ([String]::IsNullOrEmpty((Get-Content $ReadMeFilePath -Raw)))) { From 57ef60db130e8aff0344e6bcd1cf7b7945042ddd Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Sun, 26 Mar 2023 00:57:08 +0100 Subject: [PATCH 03/63] gh workflow name --- utilities/pipelines/staticValidation/module.tests.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utilities/pipelines/staticValidation/module.tests.ps1 b/utilities/pipelines/staticValidation/module.tests.ps1 index c8053f63a3..76db32f6ac 100644 --- a/utilities/pipelines/staticValidation/module.tests.ps1 +++ b/utilities/pipelines/staticValidation/module.tests.ps1 @@ -59,7 +59,8 @@ Describe 'File/folder tests' -Tag 'Modules' { ) $workflowsFolderName = Join-Path $repoRootPath '.github' 'workflows' - $workflowFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() + $workflowFileName = 'ms.{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('-', '').ToLower() + # $workflowFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() $workflowPath = Join-Path $workflowsFolderName $workflowFileName Test-Path $workflowPath | Should -Be $true -Because "path [$workflowPath] should exist." } From d3d8320e7d42ec11c41dd0ca1ecce15995a3766f Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Sun, 26 Mar 2023 01:00:00 +0100 Subject: [PATCH 04/63] ado pipeline --- .../ms.desktopvirtualization.applicationgroups.yml | 4 ++-- utilities/pipelines/staticValidation/module.tests.ps1 | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml index c5eea30bd3..60af6b2eed 100644 --- a/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml +++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml @@ -29,7 +29,7 @@ trigger: include: - '/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml' - '/.azuredevops/pipelineTemplates/*.yml' - - '/modules/Microsoft.DesktopVirtualization/applicationgroups/*' + - '/modules/desktop-virtualization/application-groups/*' - '/utilities/pipelines/*' exclude: - '/utilities/pipelines/deploymentRemoval/*' @@ -39,7 +39,7 @@ variables: - template: '../../settings.yml' - group: 'PLATFORM_VARIABLES' - name: modulePath - value: '/modules/Microsoft.DesktopVirtualization/applicationgroups' + value: '/modules/desktop-virtualization/application-groups' stages: - template: /.azuredevops/pipelineTemplates/stages.module.yml diff --git a/utilities/pipelines/staticValidation/module.tests.ps1 b/utilities/pipelines/staticValidation/module.tests.ps1 index 76db32f6ac..f7a9919968 100644 --- a/utilities/pipelines/staticValidation/module.tests.ps1 +++ b/utilities/pipelines/staticValidation/module.tests.ps1 @@ -75,7 +75,8 @@ Describe 'File/folder tests' -Tag 'Modules' { ) $pipelinesFolderName = Join-Path $repoRootPath '.azuredevops' 'modulePipelines' - $pipelineFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() + # $pipelineFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() + $pipelineFileName = 'ms.{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('-', '').ToLower() $pipelinePath = Join-Path $pipelinesFolderName $pipelineFileName Test-Path $pipelinePath | Should -Be $true -Because "path [$pipelinePath] should exist." } From 89c88d3612c4424a6f2ff3b30fbb2308a4be6d55 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Wed, 29 Mar 2023 22:18:39 +0200 Subject: [PATCH 05/63] support both --- utilities/tools/Set-ModuleReadMe.ps1 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/utilities/tools/Set-ModuleReadMe.ps1 b/utilities/tools/Set-ModuleReadMe.ps1 index 0a52426f65..fa8e2745b3 100644 --- a/utilities/tools/Set-ModuleReadMe.ps1 +++ b/utilities/tools/Set-ModuleReadMe.ps1 @@ -1482,7 +1482,12 @@ function Set-ModuleReadMe { $splitHyphens = $moduleRelative.split('-') $splitHyphens = $splitHyphens | ForEach-Object { $_.substring(0, 1).toupper() + $_.substring(1) } $splitHyphens = $splitHyphens -join '' - $fullModuleIdentifier = 'Microsoft.{0}' -f $splitHyphens.Replace('-', '') + # If willing to support both naming + if ($splitHyphens -match '^Microsoft\.(.)*') { + $fullModuleIdentifier = '{0}' -f $splitHyphens.Replace('-', '') + } else { + $fullModuleIdentifier = 'Microsoft.{0}' -f $splitHyphens.Replace('-', '') + } # Check readme if (-not (Test-Path $ReadMeFilePath) -or ([String]::IsNullOrEmpty((Get-Content $ReadMeFilePath -Raw)))) { From af1fb90d336113304e5aced0bc6b67916de8faf2 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Thu, 4 May 2023 16:23:39 +0200 Subject: [PATCH 06/63] update cross reference pester test --- .../staticValidation/module.tests.ps1 | 74 ++++++++++--------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/utilities/pipelines/staticValidation/module.tests.ps1 b/utilities/pipelines/staticValidation/module.tests.ps1 index f58a7c1cdf..fa561410d1 100644 --- a/utilities/pipelines/staticValidation/module.tests.ps1 +++ b/utilities/pipelines/staticValidation/module.tests.ps1 @@ -52,37 +52,37 @@ Describe 'File/folder tests' -Tag 'Modules' { } } - if (Test-Path (Join-Path $repoRootPath '.github')) { - It '[] Module should have a GitHub workflow' -TestCases ($moduleFolderTestCases | Where-Object { $_.isTopLevelModule }) { - - param( - [string] $moduleFolderName, - [string] $moduleFolderPath - ) - - $workflowsFolderName = Join-Path $repoRootPath '.github' 'workflows' - $workflowFileName = 'ms.{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('-', '').ToLower() - # $workflowFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() - $workflowPath = Join-Path $workflowsFolderName $workflowFileName - Test-Path $workflowPath | Should -Be $true -Because "path [$workflowPath] should exist." - } - } - - if (Test-Path (Join-Path $repoRootPath '.azuredevops')) { - It '[] Module should have an Azure DevOps pipeline' -TestCases ($moduleFolderTestCases | Where-Object { $_.isTopLevelModule }) { - - param( - [string] $moduleFolderName, - [string] $moduleFolderPath - ) - - $pipelinesFolderName = Join-Path $repoRootPath '.azuredevops' 'modulePipelines' - # $pipelineFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() - $pipelineFileName = 'ms.{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('-', '').ToLower() - $pipelinePath = Join-Path $pipelinesFolderName $pipelineFileName - Test-Path $pipelinePath | Should -Be $true -Because "path [$pipelinePath] should exist." - } - } + # if (Test-Path (Join-Path $repoRootPath '.github')) { + # It '[] Module should have a GitHub workflow' -TestCases ($moduleFolderTestCases | Where-Object { $_.isTopLevelModule }) { + + # param( + # [string] $moduleFolderName, + # [string] $moduleFolderPath + # ) + + # $workflowsFolderName = Join-Path $repoRootPath '.github' 'workflows' + # $workflowFileName = 'ms.{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('-', '').ToLower() + # # $workflowFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() + # $workflowPath = Join-Path $workflowsFolderName $workflowFileName + # Test-Path $workflowPath | Should -Be $true -Because "path [$workflowPath] should exist." + # } + # } + + # if (Test-Path (Join-Path $repoRootPath '.azuredevops')) { + # It '[] Module should have an Azure DevOps pipeline' -TestCases ($moduleFolderTestCases | Where-Object { $_.isTopLevelModule }) { + + # param( + # [string] $moduleFolderName, + # [string] $moduleFolderPath + # ) + + # $pipelinesFolderName = Join-Path $repoRootPath '.azuredevops' 'modulePipelines' + # # $pipelineFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() + # $pipelineFileName = 'ms.{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('-', '').ToLower() + # $pipelinePath = Join-Path $pipelinesFolderName $pipelineFileName + # Test-Path $pipelinePath | Should -Be $true -Because "path [$pipelinePath] should exist." + # } + # } It '[] Module should contain a [` deploy.json ` / ` deploy.bicep `] file.' -TestCases $moduleFolderTestCases { @@ -199,7 +199,8 @@ Describe 'Pipeline tests' -Tag 'Pipeline' { ) $workflowsFolderName = Join-Path $repoRootPath '.github' 'workflows' - $workflowFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() + $workflowFileName = 'ms.{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('-', '').ToLower() + # $workflowFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() $workflowPath = Join-Path $workflowsFolderName $workflowFileName Test-Path $workflowPath | Should -Be $true -Because "path [$workflowPath] should exist." } @@ -219,7 +220,8 @@ Describe 'Pipeline tests' -Tag 'Pipeline' { } $workflowsFolderName = Join-Path $repoRootPath '.github' 'workflows' - $workflowFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() + # $workflowFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() + $workflowFileName = 'ms.{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('-', '').ToLower() $workflowFilePath = Join-Path $workflowsFolderName $workflowFileName $workflowContent = Get-Content -Path $workflowFilePath @@ -268,7 +270,8 @@ Describe 'Pipeline tests' -Tag 'Pipeline' { ) $pipelinesFolderName = Join-Path $repoRootPath '.azuredevops' 'modulePipelines' - $pipelineFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() + # $pipelineFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() + $pipelineFileName = 'ms.{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('-', '').ToLower() $pipelinePath = Join-Path $pipelinesFolderName $pipelineFileName Test-Path $pipelinePath | Should -Be $true -Because "path [$pipelinePath] should exist." } @@ -288,7 +291,8 @@ Describe 'Pipeline tests' -Tag 'Pipeline' { } $pipelinesFolderName = Join-Path $repoRootPath '.azuredevops' 'modulePipelines' - $pipelineFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() + # $pipelineFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() + $pipelineFileName = 'ms.{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('-', '').ToLower() $pipelineFilePath = Join-Path $pipelinesFolderName $pipelineFileName $pipelineContent = Get-Content -Path $pipelineFilePath From b2c3ba834b20ecc599597a25050ed8e35c3efd44 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Thu, 4 May 2023 16:34:57 +0200 Subject: [PATCH 07/63] remove renamed folder --- .../.bicep/nested_roleAssignments.bicep | 82 --- .../.test/common/dependencies.bicep | 29 - .../.test/common/deploy.test.bicep | 107 ---- .../.test/min/dependencies.bicep | 18 - .../.test/min/deploy.test.bicep | 52 -- .../applications/deploy.bicep | 77 --- .../application-groups/applications/readme.md | 57 -- .../applications/version.json | 4 - .../application-groups/deploy.bicep | 186 ------- .../application-groups/readme.md | 382 ------------- .../application-groups/version.json | 4 - .../.bicep/nested_roleAssignments.bicep | 82 --- .../hostpools/.test/common/dependencies.bicep | 14 - .../hostpools/.test/common/deploy.test.bicep | 123 ----- .../hostpools/.test/min/deploy.test.bicep | 42 -- .../hostpools/deploy.bicep | 257 --------- .../hostpools/readme.md | 519 ------------------ .../hostpools/version.json | 4 - .../.bicep/nested_roleAssignments.bicep | 82 --- .../.test/common/dependencies.bicep | 14 - .../.test/common/deploy.test.bicep | 85 --- .../scalingplans/.test/min/deploy.test.bicep | 42 -- .../scalingplans/deploy.bicep | 188 ------- .../scalingplans/readme.md | 423 -------------- .../scalingplans/version.json | 4 - .../.bicep/nested_roleAssignments.bicep | 82 --- .../.test/common/dependencies.bicep | 41 -- .../workspaces/.test/common/deploy.test.bicep | 91 --- .../workspaces/.test/min/deploy.test.bicep | 42 -- .../workspaces/deploy.bicep | 152 ----- .../workspaces/readme.md | 333 ----------- .../workspaces/version.json | 4 - 32 files changed, 3622 deletions(-) delete mode 100644 modules/desktop-virtualization/application-groups/.bicep/nested_roleAssignments.bicep delete mode 100644 modules/desktop-virtualization/application-groups/.test/common/dependencies.bicep delete mode 100644 modules/desktop-virtualization/application-groups/.test/common/deploy.test.bicep delete mode 100644 modules/desktop-virtualization/application-groups/.test/min/dependencies.bicep delete mode 100644 modules/desktop-virtualization/application-groups/.test/min/deploy.test.bicep delete mode 100644 modules/desktop-virtualization/application-groups/applications/deploy.bicep delete mode 100644 modules/desktop-virtualization/application-groups/applications/readme.md delete mode 100644 modules/desktop-virtualization/application-groups/applications/version.json delete mode 100644 modules/desktop-virtualization/application-groups/deploy.bicep delete mode 100644 modules/desktop-virtualization/application-groups/readme.md delete mode 100644 modules/desktop-virtualization/application-groups/version.json delete mode 100644 modules/desktop-virtualization/hostpools/.bicep/nested_roleAssignments.bicep delete mode 100644 modules/desktop-virtualization/hostpools/.test/common/dependencies.bicep delete mode 100644 modules/desktop-virtualization/hostpools/.test/common/deploy.test.bicep delete mode 100644 modules/desktop-virtualization/hostpools/.test/min/deploy.test.bicep delete mode 100644 modules/desktop-virtualization/hostpools/deploy.bicep delete mode 100644 modules/desktop-virtualization/hostpools/readme.md delete mode 100644 modules/desktop-virtualization/hostpools/version.json delete mode 100644 modules/desktop-virtualization/scalingplans/.bicep/nested_roleAssignments.bicep delete mode 100644 modules/desktop-virtualization/scalingplans/.test/common/dependencies.bicep delete mode 100644 modules/desktop-virtualization/scalingplans/.test/common/deploy.test.bicep delete mode 100644 modules/desktop-virtualization/scalingplans/.test/min/deploy.test.bicep delete mode 100644 modules/desktop-virtualization/scalingplans/deploy.bicep delete mode 100644 modules/desktop-virtualization/scalingplans/readme.md delete mode 100644 modules/desktop-virtualization/scalingplans/version.json delete mode 100644 modules/desktop-virtualization/workspaces/.bicep/nested_roleAssignments.bicep delete mode 100644 modules/desktop-virtualization/workspaces/.test/common/dependencies.bicep delete mode 100644 modules/desktop-virtualization/workspaces/.test/common/deploy.test.bicep delete mode 100644 modules/desktop-virtualization/workspaces/.test/min/deploy.test.bicep delete mode 100644 modules/desktop-virtualization/workspaces/deploy.bicep delete mode 100644 modules/desktop-virtualization/workspaces/readme.md delete mode 100644 modules/desktop-virtualization/workspaces/version.json diff --git a/modules/desktop-virtualization/application-groups/.bicep/nested_roleAssignments.bicep b/modules/desktop-virtualization/application-groups/.bicep/nested_roleAssignments.bicep deleted file mode 100644 index c7809aafe0..0000000000 --- a/modules/desktop-virtualization/application-groups/.bicep/nested_roleAssignments.bicep +++ /dev/null @@ -1,82 +0,0 @@ -@sys.description('Required. The IDs of the principals to assign the role to.') -param principalIds array - -@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.') -param roleDefinitionIdOrName string - -@sys.description('Required. The resource ID of the resource to apply the role assignment to.') -param resourceId string - -@sys.description('Optional. The principal type of the assigned principal ID.') -@allowed([ - 'ServicePrincipal' - 'Group' - 'User' - 'ForeignGroup' - 'Device' - '' -]) -param principalType string = '' - -@sys.description('Optional. The description of the role assignment.') -param description string = '' - -@sys.description('Optional. The conditions on the role assignment. This limits the resources it can be assigned to. e.g.: @Resource[Microsoft.Storage/storageAccounts/blobServices/containers:ContainerName] StringEqualsIgnoreCase "foo_storage_container".') -param condition string = '' - -@sys.description('Optional. Version of the condition.') -@allowed([ - '2.0' -]) -param conditionVersion string = '2.0' - -@sys.description('Optional. Id of the delegated managed identity resource.') -param delegatedManagedIdentityResourceId string = '' - -var builtInRoleNames = { - 'Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ca6382a4-1721-4bcf-a114-ff0c70227b6b') - Contributor: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c') - 'Desktop Virtualization Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '86240b0e-9422-4c43-887b-b61143f32ba8') - 'Desktop Virtualization Application Group Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'aebf23d0-b568-4e86-b8f9-fe83a2c6ab55') - 'Desktop Virtualization Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '082f0a83-3be5-4ba1-904c-961cca79b387') - 'Desktop Virtualization Host Pool Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e307426c-f9b6-4e81-87de-d99efb3c32bc') - 'Desktop Virtualization Host Pool Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ceadfde2-b300-400a-ab7b-6143895aa822') - 'Desktop Virtualization Power On Off Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '40c5ff49-9181-41f8-ae61-143b0e78555e') - 'Desktop Virtualization Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '49a72310-ab8d-41df-bbb0-79b649203868') - 'Desktop Virtualization Session Host Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2ad6aaab-ead9-4eaa-8ac5-da422f562408') - 'Desktop Virtualization User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '1d18fff3-a72a-46b5-b4a9-0b38a3cd7e63') - 'Desktop Virtualization User Session Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ea4bfff8-7fb4-485a-aadd-d4129a0ffaa6') - 'Desktop Virtualization Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a959dbd1-f747-45e3-8ba6-dd80f235f97c') - 'Desktop Virtualization Workspace Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21efdde3-836f-432b-bf3d-3e8e734d4b2b') - 'Desktop Virtualization Workspace Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0fa44ee9-7a7d-466b-9bb2-2bf446b1204d') - 'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293') - 'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893') - 'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e') - 'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae') - 'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44') - 'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa') - 'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05') - Owner: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635') - Reader: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7') - 'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608') - 'Role Based Access Control Administrator (Preview)': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f58310d9-a9f6-439a-9e8d-f62e7b41a168') - 'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9') -} - -resource appGroup 'Microsoft.DesktopVirtualization/applicationGroups@2022-09-09' existing = { - name: last(split(resourceId, '/'))! -} - -resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = [for principalId in principalIds: { - name: guid(appGroup.id, principalId, roleDefinitionIdOrName) - properties: { - description: description - roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName - principalId: principalId - principalType: !empty(principalType) ? any(principalType) : null - condition: !empty(condition) ? condition : null - conditionVersion: !empty(conditionVersion) && !empty(condition) ? conditionVersion : null - delegatedManagedIdentityResourceId: !empty(delegatedManagedIdentityResourceId) ? delegatedManagedIdentityResourceId : null - } - scope: appGroup -}] diff --git a/modules/desktop-virtualization/application-groups/.test/common/dependencies.bicep b/modules/desktop-virtualization/application-groups/.test/common/dependencies.bicep deleted file mode 100644 index 41ca94022b..0000000000 --- a/modules/desktop-virtualization/application-groups/.test/common/dependencies.bicep +++ /dev/null @@ -1,29 +0,0 @@ -@description('Optional. The location to deploy to.') -param location string = resourceGroup().location - -@description('Required. The name of the Managed Identity to create.') -param managedIdentityName string - -@description('Required. The name of the Host Pool to create.') -param hostPoolName string - -resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { - name: managedIdentityName - location: location -} - -resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2022-09-09' = { - name: hostPoolName - location: location - properties: { - hostPoolType: 'Pooled' - loadBalancerType: 'BreadthFirst' - preferredAppGroupType: 'Desktop' - } -} - -@description('The principal ID of the created Managed Identity.') -output managedIdentityPrincipalId string = managedIdentity.properties.principalId - -@description('The name of the created Host Pool.') -output hostPoolName string = hostPool.name diff --git a/modules/desktop-virtualization/application-groups/.test/common/deploy.test.bicep b/modules/desktop-virtualization/application-groups/.test/common/deploy.test.bicep deleted file mode 100644 index 4eb0f92416..0000000000 --- a/modules/desktop-virtualization/application-groups/.test/common/deploy.test.bicep +++ /dev/null @@ -1,107 +0,0 @@ -targetScope = 'subscription' - -// ========== // -// 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 - -// ============ // -// 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-<>-msi-${serviceShort}' - hostPoolName: 'dep-<>-hp-${serviceShort}' - } -} - -// Diagnostics -// =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { - scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' - params: { - storageAccountName: 'dep<>diasa${serviceShort}01' - logAnalyticsWorkspaceName: 'dep-<>-law-${serviceShort}' - eventHubNamespaceEventHubName: 'dep-<>-evh-${serviceShort}' - eventHubNamespaceName: 'dep-<>-evhns-${serviceShort}' - location: location - } -} - -// ============== // -// Test Execution // -// ============== // - -module testDeployment '../../deploy.bicep' = { - scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' - params: { - enableDefaultTelemetry: enableDefaultTelemetry - name: '<>${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' - diagnosticLogsRetentionInDays: 7 - diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId - diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId - diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId - diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName - friendlyName: 'Remote Applications 1' - location: location - lock: 'CanNotDelete' - roleAssignments: [ - { - roleDefinitionIdOrName: 'Reader' - principalIds: [ - nestedDependencies.outputs.managedIdentityPrincipalId - ] - principalType: 'ServicePrincipal' - } - ] - tags: { - Environment: 'Non-Prod' - Role: 'DeploymentValidation' - } - } -} diff --git a/modules/desktop-virtualization/application-groups/.test/min/dependencies.bicep b/modules/desktop-virtualization/application-groups/.test/min/dependencies.bicep deleted file mode 100644 index c97eeab034..0000000000 --- a/modules/desktop-virtualization/application-groups/.test/min/dependencies.bicep +++ /dev/null @@ -1,18 +0,0 @@ -@description('Optional. The location to deploy to.') -param location string = resourceGroup().location - -@description('Required. The name of the Host Pool to create.') -param hostPoolName string - -resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2022-09-09' = { - name: hostPoolName - location: location - properties: { - hostPoolType: 'Pooled' - loadBalancerType: 'BreadthFirst' - preferredAppGroupType: 'Desktop' - } -} - -@description('The name of the created Host Pool.') -output hostPoolName string = hostPool.name diff --git a/modules/desktop-virtualization/application-groups/.test/min/deploy.test.bicep b/modules/desktop-virtualization/application-groups/.test/min/deploy.test.bicep deleted file mode 100644 index 518b3e2cc1..0000000000 --- a/modules/desktop-virtualization/application-groups/.test/min/deploy.test.bicep +++ /dev/null @@ -1,52 +0,0 @@ -targetScope = 'subscription' - -// ========== // -// 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 = 'dvagmin' - -@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true - -// ============ // -// 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: { - hostPoolName: 'dep-<>-hp-${serviceShort}' - } -} - -// ============== // -// Test Execution // -// ============== // - -module testDeployment '../../deploy.bicep' = { - scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' - params: { - enableDefaultTelemetry: enableDefaultTelemetry - name: '<>${serviceShort}001' - applicationGroupType: 'RemoteApp' - hostpoolName: nestedDependencies.outputs.hostPoolName - } -} diff --git a/modules/desktop-virtualization/application-groups/applications/deploy.bicep b/modules/desktop-virtualization/application-groups/applications/deploy.bicep deleted file mode 100644 index d1753d398f..0000000000 --- a/modules/desktop-virtualization/application-groups/applications/deploy.bicep +++ /dev/null @@ -1,77 +0,0 @@ -@sys.description('Conditional. The name of the parent Application Group to create the application(s) in. Required if the template is used in a standalone deployment.') -param appGroupName string - -@sys.description('Required. Name of the Application to be created in the Application Group.') -param name string - -@sys.description('Optional. Description of Application..') -param description string = '' - -@sys.description('Required. Friendly name of Application..') -param friendlyName string - -@sys.description('Required. Specifies a path for the executable file for the application.') -param filePath string - -@allowed([ - 'Allow' - 'DoNotAllow' - 'Require' -]) -@sys.description('Optional. Specifies whether this published application can be launched with command-line arguments provided by the client, command-line arguments specified at publish time, or no command-line arguments at all.') -param commandLineSetting string = 'DoNotAllow' - -@sys.description('Optional. Command-Line Arguments for Application.') -param commandLineArguments string = '' - -@sys.description('Optional. Specifies whether to show the RemoteApp program in the RD Web Access server.') -param showInPortal bool = false - -@sys.description('Optional. Path to icon.') -param iconPath string = '' - -@sys.description('Optional. Index of the icon.') -param iconIndex int = 0 - -@sys.description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true - -resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { - name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' - properties: { - mode: 'Incremental' - template: { - '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' - contentVersion: '1.0.0.0' - resources: [] - } - } -} - -resource applicationGroup 'Microsoft.DesktopVirtualization/applicationGroups@2022-09-09' existing = { - name: appGroupName -} - -resource application 'Microsoft.DesktopVirtualization/applicationGroups/applications@2022-09-09' = { - name: name - parent: applicationGroup - properties: { - description: description - friendlyName: friendlyName - filePath: filePath - commandLineSetting: commandLineSetting - commandLineArguments: commandLineArguments - showInPortal: showInPortal - iconPath: iconPath - iconIndex: iconIndex - } -} - -@sys.description('The resource ID of the deployed Application.') -output resourceId string = application.id - -@sys.description('The name of the Resource Group the AVD Application was created in.') -output resourceGroupName string = resourceGroup().name - -@sys.description('The Name of the Application Group to register the Application in.') -output name string = appGroupName diff --git a/modules/desktop-virtualization/application-groups/applications/readme.md b/modules/desktop-virtualization/application-groups/applications/readme.md deleted file mode 100644 index f506641709..0000000000 --- a/modules/desktop-virtualization/application-groups/applications/readme.md +++ /dev/null @@ -1,57 +0,0 @@ -# AVD Applications `[Microsoft.DesktopVirtualization/applicationGroups/applications]` - -This module deploys AVD Applications. - -## Navigation - -- [Resource types](#Resource-types) -- [Parameters](#Parameters) -- [Outputs](#Outputs) -- [Cross-referenced modules](#Cross-referenced-modules) - -## Resource types - -| Resource Type | API Version | -| :-- | :-- | -| `Microsoft.DesktopVirtualization/applicationGroups/applications` | [2022-09-09](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2022-09-09/applicationGroups/applications) | - -## Parameters - -**Required parameters** - -| Parameter Name | Type | Description | -| :-- | :-- | :-- | -| `filePath` | string | Specifies a path for the executable file for the application. | -| `friendlyName` | string | Friendly name of Application.. | -| `name` | string | Name of the Application to be created in the Application Group. | - -**Conditional parameters** - -| Parameter Name | Type | Description | -| :-- | :-- | :-- | -| `appGroupName` | string | The name of the parent Application Group to create the application(s) in. Required if the template is used in a standalone deployment. | - -**Optional parameters** - -| Parameter Name | Type | Default Value | Allowed Values | Description | -| :-- | :-- | :-- | :-- | :-- | -| `commandLineArguments` | string | `''` | | Command-Line Arguments for Application. | -| `commandLineSetting` | string | `'DoNotAllow'` | `[Allow, DoNotAllow, Require]` | Specifies whether this published application can be launched with command-line arguments provided by the client, command-line arguments specified at publish time, or no command-line arguments at all. | -| `description` | string | `''` | | Description of Application.. | -| `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via a Globally Unique Identifier (GUID). | -| `iconIndex` | int | `0` | | Index of the icon. | -| `iconPath` | string | `''` | | Path to icon. | -| `showInPortal` | bool | `False` | | Specifies whether to show the RemoteApp program in the RD Web Access server. | - - -## Outputs - -| Output Name | Type | Description | -| :-- | :-- | :-- | -| `name` | string | The Name of the Application Group to register the Application in. | -| `resourceGroupName` | string | The name of the Resource Group the AVD Application was created in. | -| `resourceId` | string | The resource ID of the deployed Application. | - -## Cross-referenced modules - -_None_ diff --git a/modules/desktop-virtualization/application-groups/applications/version.json b/modules/desktop-virtualization/application-groups/applications/version.json deleted file mode 100644 index 56f8d9ca40..0000000000 --- a/modules/desktop-virtualization/application-groups/applications/version.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "0.4" -} diff --git a/modules/desktop-virtualization/application-groups/deploy.bicep b/modules/desktop-virtualization/application-groups/deploy.bicep deleted file mode 100644 index d12d05bd5a..0000000000 --- a/modules/desktop-virtualization/application-groups/deploy.bicep +++ /dev/null @@ -1,186 +0,0 @@ -@sys.description('Required. Name of the Application Group to create this application in.') -@minLength(1) -param name string - -@sys.description('Optional. Location for all resources.') -param location string = resourceGroup().location - -@sys.description('Required. The type of the Application Group to be created. Allowed values: RemoteApp or Desktop.') -@allowed([ - 'RemoteApp' - 'Desktop' -]) -param applicationGroupType string - -@sys.description('Required. Name of the Host Pool to be linked to this Application Group.') -param hostpoolName string - -@sys.description('Optional. The friendly name of the Application Group to be created.') -param friendlyName string = '' - -@sys.description('Optional. The description of the Application Group to be created.') -param description string = '' - -@sys.description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalIds\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'.') -param roleAssignments array = [] - -@sys.description('Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely.') -@minValue(0) -@maxValue(365) -param diagnosticLogsRetentionInDays int = 365 - -@sys.description('Optional. Resource ID of the diagnostic storage account.') -param diagnosticStorageAccountId string = '' - -@sys.description('Optional. Resource ID of log analytics.') -param diagnosticWorkspaceId string = '' - -@sys.description('Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to.') -param diagnosticEventHubAuthorizationRuleId string = '' - -@sys.description('Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category.') -param diagnosticEventHubName string = '' - -@allowed([ - '' - 'CanNotDelete' - 'ReadOnly' -]) -@sys.description('Optional. Specify the type of lock.') -param lock string = '' - -@sys.description('Optional. Tags of the resource.') -param tags object = {} - -@sys.description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true - -@sys.description('Optional. The name of logs that will be streamed. "allLogs" includes all possible logs for the resource.') -@allowed([ - 'allLogs' - 'Checkpoint' - 'Error' - 'Management' -]) -param diagnosticLogCategoriesToEnable array = [ - 'allLogs' -] - -@sys.description('Optional. List of applications to be created in the Application Group.') -param applications array = [] - -@sys.description('Optional. The name of the diagnostic setting, if deployed. If left empty, it defaults to "-diagnosticSettings".') -param diagnosticSettingsName string = '' - -var diagnosticsLogsSpecified = [for category in filter(diagnosticLogCategoriesToEnable, item => item != 'allLogs'): { - category: category - enabled: true - retentionPolicy: { - enabled: true - days: diagnosticLogsRetentionInDays - } -}] - -var diagnosticsLogs = contains(diagnosticLogCategoriesToEnable, 'allLogs') ? [ - { - categoryGroup: 'allLogs' - enabled: true - retentionPolicy: { - enabled: true - days: diagnosticLogsRetentionInDays - } - } -] : diagnosticsLogsSpecified - -var enableReferencedModulesTelemetry = false - -resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { - name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name, location)}' - properties: { - mode: 'Incremental' - template: { - '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' - contentVersion: '1.0.0.0' - resources: [] - } - } -} - -resource appGroup_hostpool 'Microsoft.DesktopVirtualization/hostPools@2022-09-09' existing = { - name: hostpoolName -} - -resource appGroup 'Microsoft.DesktopVirtualization/applicationGroups@2022-09-09' = { - name: name - location: location - tags: tags - properties: { - hostPoolArmPath: appGroup_hostpool.id - friendlyName: friendlyName - description: description - applicationGroupType: applicationGroupType - } -} - -resource appGroup_lock 'Microsoft.Authorization/locks@2020-05-01' = if (!empty(lock)) { - name: '${appGroup.name}-${lock}-lock' - properties: { - level: any(lock) - notes: lock == 'CanNotDelete' ? 'Cannot delete resource or child resources.' : 'Cannot modify the resource or child resources.' - } - scope: appGroup -} - -resource appGroup_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@2021-05-01-preview' = if ((!empty(diagnosticStorageAccountId)) || (!empty(diagnosticWorkspaceId)) || (!empty(diagnosticEventHubAuthorizationRuleId)) || (!empty(diagnosticEventHubName))) { - name: !empty(diagnosticSettingsName) ? diagnosticSettingsName : '${name}-diagnosticSettings' - properties: { - storageAccountId: !empty(diagnosticStorageAccountId) ? diagnosticStorageAccountId : null - workspaceId: !empty(diagnosticWorkspaceId) ? diagnosticWorkspaceId : null - eventHubAuthorizationRuleId: !empty(diagnosticEventHubAuthorizationRuleId) ? diagnosticEventHubAuthorizationRuleId : null - eventHubName: !empty(diagnosticEventHubName) ? diagnosticEventHubName : null - logs: diagnosticsLogs - } - scope: appGroup -} - -module appGroup_applications 'applications/deploy.bicep' = [for (application, index) in applications: { - name: '${uniqueString(deployment().name, location)}-AppGroup-App-${index}' - params: { - name: application.name - appGroupName: appGroup.name - description: contains(application, 'description') ? application.description : '' - friendlyName: contains(application, 'friendlyName') ? application.friendlyName : appGroup.name - filePath: application.filePath - commandLineSetting: contains(application, 'commandLineSetting') ? application.commandLineSetting : 'DoNotAllow' - commandLineArguments: contains(application, 'commandLineArguments') ? application.commandLineArguments : '' - showInPortal: contains(application, 'showInPortal') ? application.showInPortal : false - iconPath: contains(application, 'iconPath') ? application.iconPath : application.filePath - iconIndex: contains(application, 'iconIndex') ? application.iconIndex : 0 - enableDefaultTelemetry: enableReferencedModulesTelemetry - } -}] - -module appGroup_roleAssignments '.bicep/nested_roleAssignments.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${uniqueString(deployment().name, location)}-AppGroup-Rbac-${index}' - params: { - description: contains(roleAssignment, 'description') ? roleAssignment.description : '' - principalIds: roleAssignment.principalIds - principalType: contains(roleAssignment, 'principalType') ? roleAssignment.principalType : '' - roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName - condition: contains(roleAssignment, 'condition') ? roleAssignment.condition : '' - delegatedManagedIdentityResourceId: contains(roleAssignment, 'delegatedManagedIdentityResourceId') ? roleAssignment.delegatedManagedIdentityResourceId : '' - resourceId: appGroup.id - } -}] - -@sys.description('The resource ID of the AVD application group.') -output resourceId string = appGroup.id - -@sys.description('The resource group the AVD application group was deployed into.') -output resourceGroupName string = resourceGroup().name - -@sys.description('The name of the AVD application group.') -output name string = appGroup.name - -@sys.description('The location the resource was deployed into.') -output location string = appGroup.location diff --git a/modules/desktop-virtualization/application-groups/readme.md b/modules/desktop-virtualization/application-groups/readme.md deleted file mode 100644 index d09b772788..0000000000 --- a/modules/desktop-virtualization/application-groups/readme.md +++ /dev/null @@ -1,382 +0,0 @@ -# AVD Application Groups `[Microsoft.DesktopVirtualization/applicationGroups]` - -This module deploys an Azure virtual desktop application group. - -## Navigation - -- [Resource types](#Resource-types) -- [Parameters](#Parameters) -- [Outputs](#Outputs) -- [Cross-referenced modules](#Cross-referenced-modules) -- [Deployment examples](#Deployment-examples) - -## Resource types - -| Resource Type | API Version | -| :-- | :-- | -| `Microsoft.Authorization/locks` | [2020-05-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2020-05-01/locks) | -| `Microsoft.Authorization/roleAssignments` | [2022-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments) | -| `Microsoft.DesktopVirtualization/applicationGroups` | [2022-09-09](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2022-09-09/applicationGroups) | -| `Microsoft.DesktopVirtualization/applicationGroups/applications` | [2022-09-09](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2022-09-09/applicationGroups/applications) | -| `Microsoft.Insights/diagnosticSettings` | [2021-05-01-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) | - -## Parameters - -**Required parameters** - -| Parameter Name | Type | Allowed Values | Description | -| :-- | :-- | :-- | :-- | -| `applicationGroupType` | string | `[Desktop, RemoteApp]` | The type of the Application Group to be created. Allowed values: RemoteApp or Desktop. | -| `hostpoolName` | string | | Name of the Host Pool to be linked to this Application Group. | -| `name` | string | | Name of the Application Group to create this application in. | - -**Optional parameters** - -| Parameter Name | Type | Default Value | Allowed Values | Description | -| :-- | :-- | :-- | :-- | :-- | -| `applications` | _[applications](applications/readme.md)_ array | `[]` | | List of applications to be created in the Application Group. | -| `description` | string | `''` | | The description of the Application Group to be created. | -| `diagnosticEventHubAuthorizationRuleId` | string | `''` | | Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | -| `diagnosticEventHubName` | string | `''` | | Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | -| `diagnosticLogCategoriesToEnable` | array | `[allLogs]` | `[allLogs, Checkpoint, Error, Management]` | The name of logs that will be streamed. "allLogs" includes all possible logs for the resource. | -| `diagnosticLogsRetentionInDays` | int | `365` | | Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | -| `diagnosticSettingsName` | string | `''` | | The name of the diagnostic setting, if deployed. If left empty, it defaults to "-diagnosticSettings". | -| `diagnosticStorageAccountId` | string | `''` | | Resource ID of the diagnostic storage account. | -| `diagnosticWorkspaceId` | string | `''` | | Resource ID of log analytics. | -| `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via a Globally Unique Identifier (GUID). | -| `friendlyName` | string | `''` | | The friendly name of the Application Group to be created. | -| `location` | string | `[resourceGroup().location]` | | Location for all resources. | -| `lock` | string | `''` | `['', CanNotDelete, ReadOnly]` | Specify the type of lock. | -| `roleAssignments` | array | `[]` | | Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalIds' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'. | -| `tags` | object | `{object}` | | Tags of the resource. | - - -### Parameter Usage: `roleAssignments` - -Create a role assignment for the given resource. If you want to assign a service principal / managed identity that is created in the same deployment, make sure to also specify the `'principalType'` parameter and set it to `'ServicePrincipal'`. This will ensure the role assignment waits for the principal's propagation in Azure. - -
- -Parameter JSON format - -```json -"roleAssignments": { - "value": [ - { - "roleDefinitionIdOrName": "Reader", - "description": "Reader Role Assignment", - "principalIds": [ - "12345678-1234-1234-1234-123456789012", // object 1 - "78945612-1234-1234-1234-123456789012" // object 2 - ] - }, - { - "roleDefinitionIdOrName": "/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11", - "principalIds": [ - "12345678-1234-1234-1234-123456789012" // object 1 - ], - "principalType": "ServicePrincipal" - } - ] -} -``` - -
- -
- -Bicep format - -```bicep -roleAssignments: [ - { - roleDefinitionIdOrName: 'Reader' - description: 'Reader Role Assignment' - principalIds: [ - '12345678-1234-1234-1234-123456789012' // object 1 - '78945612-1234-1234-1234-123456789012' // object 2 - ] - } - { - roleDefinitionIdOrName: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' - principalIds: [ - '12345678-1234-1234-1234-123456789012' // object 1 - ] - principalType: 'ServicePrincipal' - } -] -``` - -
-

- -### Parameter Usage: `tags` - -Tag names and tag values can be provided as needed. A tag can be left without a value. - -

- -Parameter JSON format - -```json -"tags": { - "value": { - "Environment": "Non-Prod", - "Contact": "test.user@testcompany.com", - "PurchaseOrder": "1234", - "CostCenter": "7890", - "ServiceName": "DeploymentValidation", - "Role": "DeploymentValidation" - } -} -``` - -
- -
- -Bicep format - -```bicep -tags: { - Environment: 'Non-Prod' - Contact: 'test.user@testcompany.com' - PurchaseOrder: '1234' - CostCenter: '7890' - ServiceName: 'DeploymentValidation' - Role: 'DeploymentValidation' -} -``` - -
-

- -## Outputs - -| Output Name | Type | Description | -| :-- | :-- | :-- | -| `location` | string | The location the resource was deployed into. | -| `name` | string | The name of the AVD application group. | -| `resourceGroupName` | string | The resource group the AVD application group was deployed into. | -| `resourceId` | string | The resource ID of the AVD application group. | - -## Cross-referenced modules - -_None_ - -## Deployment examples - -The following module usage examples are retrieved from the content of the files hosted in the module's `.test` folder. - >**Note**: The name of each example is based on the name of the file from which it is taken. - - >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order. - -

Example 1: Common

- -
- -via Bicep module - -```bicep -module applicationGroups './desktop-virtualization/application-groups/deploy.bicep' = { - name: '${uniqueString(deployment().name, location)}-test-dvagcom' - params: { - // Required parameters - applicationGroupType: 'RemoteApp' - hostpoolName: '' - name: '<>dvagcom001' - // Non-required parameters - 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' - diagnosticEventHubAuthorizationRuleId: '' - diagnosticEventHubName: '' - diagnosticLogsRetentionInDays: 7 - diagnosticStorageAccountId: '' - diagnosticWorkspaceId: '' - enableDefaultTelemetry: '' - friendlyName: 'Remote Applications 1' - location: '' - lock: 'CanNotDelete' - roleAssignments: [ - { - principalIds: [ - '' - ] - principalType: 'ServicePrincipal' - roleDefinitionIdOrName: 'Reader' - } - ] - tags: { - Environment: 'Non-Prod' - Role: 'DeploymentValidation' - } - } -} -``` - -
-

- -

- -via JSON Parameter file - -```json -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - // Required parameters - "applicationGroupType": { - "value": "RemoteApp" - }, - "hostpoolName": { - "value": "" - }, - "name": { - "value": "<>dvagcom001" - }, - // Non-required parameters - "applications": { - "value": [ - { - "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": { - "value": "This is my first Remote Applications bundle" - }, - "diagnosticEventHubAuthorizationRuleId": { - "value": "" - }, - "diagnosticEventHubName": { - "value": "" - }, - "diagnosticLogsRetentionInDays": { - "value": 7 - }, - "diagnosticStorageAccountId": { - "value": "" - }, - "diagnosticWorkspaceId": { - "value": "" - }, - "enableDefaultTelemetry": { - "value": "" - }, - "friendlyName": { - "value": "Remote Applications 1" - }, - "location": { - "value": "" - }, - "lock": { - "value": "CanNotDelete" - }, - "roleAssignments": { - "value": [ - { - "principalIds": [ - "" - ], - "principalType": "ServicePrincipal", - "roleDefinitionIdOrName": "Reader" - } - ] - }, - "tags": { - "value": { - "Environment": "Non-Prod", - "Role": "DeploymentValidation" - } - } - } -} -``` - -
-

- -

Example 2: Min

- -
- -via Bicep module - -```bicep -module applicationGroups './desktop-virtualization/application-groups/deploy.bicep' = { - name: '${uniqueString(deployment().name, location)}-test-dvagmin' - params: { - // Required parameters - applicationGroupType: 'RemoteApp' - hostpoolName: '' - name: '<>dvagmin001' - // Non-required parameters - enableDefaultTelemetry: '' - } -} -``` - -
-

- -

- -via JSON Parameter file - -```json -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - // Required parameters - "applicationGroupType": { - "value": "RemoteApp" - }, - "hostpoolName": { - "value": "" - }, - "name": { - "value": "<>dvagmin001" - }, - // Non-required parameters - "enableDefaultTelemetry": { - "value": "" - } - } -} -``` - -
-

diff --git a/modules/desktop-virtualization/application-groups/version.json b/modules/desktop-virtualization/application-groups/version.json deleted file mode 100644 index 56f8d9ca40..0000000000 --- a/modules/desktop-virtualization/application-groups/version.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "0.4" -} diff --git a/modules/desktop-virtualization/hostpools/.bicep/nested_roleAssignments.bicep b/modules/desktop-virtualization/hostpools/.bicep/nested_roleAssignments.bicep deleted file mode 100644 index 26992c24af..0000000000 --- a/modules/desktop-virtualization/hostpools/.bicep/nested_roleAssignments.bicep +++ /dev/null @@ -1,82 +0,0 @@ -@sys.description('Required. The IDs of the principals to assign the role to.') -param principalIds array - -@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.') -param roleDefinitionIdOrName string - -@sys.description('Required. The resource ID of the resource to apply the role assignment to.') -param resourceId string - -@sys.description('Optional. The principal type of the assigned principal ID.') -@allowed([ - 'ServicePrincipal' - 'Group' - 'User' - 'ForeignGroup' - 'Device' - '' -]) -param principalType string = '' - -@sys.description('Optional. The description of the role assignment.') -param description string = '' - -@sys.description('Optional. The conditions on the role assignment. This limits the resources it can be assigned to. e.g.: @Resource[Microsoft.Storage/storageAccounts/blobServices/containers:ContainerName] StringEqualsIgnoreCase "foo_storage_container".') -param condition string = '' - -@sys.description('Optional. Version of the condition.') -@allowed([ - '2.0' -]) -param conditionVersion string = '2.0' - -@sys.description('Optional. Id of the delegated managed identity resource.') -param delegatedManagedIdentityResourceId string = '' - -var builtInRoleNames = { - 'Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ca6382a4-1721-4bcf-a114-ff0c70227b6b') - Contributor: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c') - 'Desktop Virtualization Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '86240b0e-9422-4c43-887b-b61143f32ba8') - 'Desktop Virtualization Application Group Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'aebf23d0-b568-4e86-b8f9-fe83a2c6ab55') - 'Desktop Virtualization Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '082f0a83-3be5-4ba1-904c-961cca79b387') - 'Desktop Virtualization Host Pool Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e307426c-f9b6-4e81-87de-d99efb3c32bc') - 'Desktop Virtualization Host Pool Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ceadfde2-b300-400a-ab7b-6143895aa822') - 'Desktop Virtualization Power On Off Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '40c5ff49-9181-41f8-ae61-143b0e78555e') - 'Desktop Virtualization Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '49a72310-ab8d-41df-bbb0-79b649203868') - 'Desktop Virtualization Session Host Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2ad6aaab-ead9-4eaa-8ac5-da422f562408') - 'Desktop Virtualization User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '1d18fff3-a72a-46b5-b4a9-0b38a3cd7e63') - 'Desktop Virtualization User Session Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ea4bfff8-7fb4-485a-aadd-d4129a0ffaa6') - 'Desktop Virtualization Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a959dbd1-f747-45e3-8ba6-dd80f235f97c') - 'Desktop Virtualization Workspace Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21efdde3-836f-432b-bf3d-3e8e734d4b2b') - 'Desktop Virtualization Workspace Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0fa44ee9-7a7d-466b-9bb2-2bf446b1204d') - 'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293') - 'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893') - 'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e') - 'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae') - 'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44') - 'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa') - 'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05') - Owner: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635') - Reader: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7') - 'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608') - 'Role Based Access Control Administrator (Preview)': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f58310d9-a9f6-439a-9e8d-f62e7b41a168') - 'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9') -} - -resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2022-09-09' existing = { - name: last(split(resourceId, '/'))! -} - -resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = [for principalId in principalIds: { - name: guid(hostPool.id, principalId, roleDefinitionIdOrName) - properties: { - description: description - roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName - principalId: principalId - principalType: !empty(principalType) ? any(principalType) : null - condition: !empty(condition) ? condition : null - conditionVersion: !empty(conditionVersion) && !empty(condition) ? conditionVersion : null - delegatedManagedIdentityResourceId: !empty(delegatedManagedIdentityResourceId) ? delegatedManagedIdentityResourceId : null - } - scope: hostPool -}] diff --git a/modules/desktop-virtualization/hostpools/.test/common/dependencies.bicep b/modules/desktop-virtualization/hostpools/.test/common/dependencies.bicep deleted file mode 100644 index 7371d4437b..0000000000 --- a/modules/desktop-virtualization/hostpools/.test/common/dependencies.bicep +++ /dev/null @@ -1,14 +0,0 @@ -@description('Optional. The location to deploy to.') -param location string = resourceGroup().location - -@description('Required. The name of the Managed Identity to create.') -param managedIdentityName string - -resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { - name: managedIdentityName - location: location -} - -@description('The principal ID of the created Managed Identity.') -output managedIdentityPrincipalId string = managedIdentity.properties.principalId - diff --git a/modules/desktop-virtualization/hostpools/.test/common/deploy.test.bicep b/modules/desktop-virtualization/hostpools/.test/common/deploy.test.bicep deleted file mode 100644 index e2b7715a47..0000000000 --- a/modules/desktop-virtualization/hostpools/.test/common/deploy.test.bicep +++ /dev/null @@ -1,123 +0,0 @@ -targetScope = 'subscription' - -// ========== // -// 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 - -// ============ // -// 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-<>-msi-${serviceShort}' - } -} - -// Diagnostics -// =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { - scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' - params: { - storageAccountName: 'dep<>diasa${serviceShort}01' - logAnalyticsWorkspaceName: 'dep-<>-law-${serviceShort}' - eventHubNamespaceEventHubName: 'dep-<>-evh-${serviceShort}' - eventHubNamespaceName: 'dep-<>-evhns-${serviceShort}' - location: location - } -} - -// ============== // -// Test Execution // -// ============== // - -module testDeployment '../../deploy.bicep' = { - scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' - params: { - enableDefaultTelemetry: enableDefaultTelemetry - name: '<>${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;' - diagnosticLogsRetentionInDays: 7 - 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: 'CanNotDelete' - maxSessionLimit: 99999 - personalDesktopAssignmentType: 'Automatic' - roleAssignments: [ - { - roleDefinitionIdOrName: 'Reader' - principalIds: [ - 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: { - 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/hostpools/.test/min/deploy.test.bicep b/modules/desktop-virtualization/hostpools/.test/min/deploy.test.bicep deleted file mode 100644 index 4c9a96927a..0000000000 --- a/modules/desktop-virtualization/hostpools/.test/min/deploy.test.bicep +++ /dev/null @@ -1,42 +0,0 @@ -targetScope = 'subscription' - -// ========== // -// 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 = 'dvhpmin' - -@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true - -// ============ // -// Dependencies // -// ============ // - -// General resources -// ================= -resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { - name: resourceGroupName - location: location -} - -// ============== // -// Test Execution // -// ============== // - -module testDeployment '../../deploy.bicep' = { - scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' - params: { - enableDefaultTelemetry: enableDefaultTelemetry - name: '<>${serviceShort}001' - } -} diff --git a/modules/desktop-virtualization/hostpools/deploy.bicep b/modules/desktop-virtualization/hostpools/deploy.bicep deleted file mode 100644 index e55a4e2c5d..0000000000 --- a/modules/desktop-virtualization/hostpools/deploy.bicep +++ /dev/null @@ -1,257 +0,0 @@ -@sys.description('Required. Name of the Host Pool.') -@minLength(1) -param name string - -@sys.description('Optional. Location for all resources.') -param location string = resourceGroup().location - -@sys.description('Optional. The friendly name of the Host Pool to be created.') -param friendlyName string = '' - -@sys.description('Optional. The description of the Host Pool to be created.') -param description string = '' - -@sys.description('Optional. Set this parameter to Personal if you would like to enable Persistent Desktop experience. Defaults to Pooled.') -@allowed([ - 'Personal' - 'Pooled' -]) -param type string = 'Pooled' - -@sys.description('Optional. Set the type of assignment for a Personal Host Pool type.') -@allowed([ - 'Automatic' - 'Direct' - '' -]) -param personalDesktopAssignmentType string = '' - -@sys.description('Optional. Type of load balancer algorithm.') -@allowed([ - 'BreadthFirst' - 'DepthFirst' - 'Persistent' -]) -param loadBalancerType string = 'BreadthFirst' - -@sys.description('Optional. Maximum number of sessions.') -param maxSessionLimit int = 99999 - -@sys.description('Optional. Host Pool RDP properties.') -param customRdpProperty string = '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;' - -@sys.description('Optional. Validation host pools allows you to test service changes before they are deployed to production. When set to true, the Host Pool will be deployed in a validation \'ring\' (environment) that receives all the new features (might be less stable). Defaults to false that stands for the stable, production-ready environment.') -param validationEnvironment bool = false - -@sys.description('Optional. The necessary information for adding more VMs to this Host Pool.') -param vmTemplate object = {} - -@sys.description('Optional. Host Pool token validity length. Usage: \'PT8H\' - valid for 8 hours; \'P5D\' - valid for 5 days; \'P1Y\' - valid for 1 year. When not provided, the token will be valid for 8 hours.') -param tokenValidityLength string = 'PT8H' - -@sys.description('Generated. Do not provide a value! This date value is used to generate a registration token.') -param baseTime string = utcNow('u') - -@sys.description('Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely.') -@minValue(0) -@maxValue(365) -param diagnosticLogsRetentionInDays int = 365 - -@sys.description('Optional. Resource ID of the diagnostic storage account.') -param diagnosticStorageAccountId string = '' - -@sys.description('Optional. Resource ID of the diagnostic log analytics workspace.') -param diagnosticWorkspaceId string = '' - -@sys.description('Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to.') -param diagnosticEventHubAuthorizationRuleId string = '' - -@sys.description('Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category.') -param diagnosticEventHubName string = '' - -@allowed([ - '' - 'CanNotDelete' - 'ReadOnly' -]) -@sys.description('Optional. Specify the type of lock.') -param lock string = '' - -@sys.description('Optional. Tags of the resource.') -param tags object = {} - -@sys.description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true - -@sys.description('Optional. The type of preferred application group type, default to Desktop Application Group.') -@allowed([ - 'Desktop' - 'None' - 'RailApplications' -]) -param preferredAppGroupType string = 'Desktop' - -@sys.description('Optional. Enable Start VM on connect to allow users to start the virtual machine from a deallocated state. Important: Custom RBAC role required to power manage VMs.') -param startVMOnConnect bool = false - -@sys.description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalIds\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'.') -param roleAssignments array = [] - -@sys.description('Optional. The session host configuration for updating agent, monitoring agent, and stack component.') -param agentUpdate object = { - useSessionHostLocalTime: true -} - -@sys.description('Optional. The ring number of HostPool.') -param ring int = -1 - -@sys.description('Optional. URL to customer ADFS server for signing WVD SSO certificates.') -param ssoadfsAuthority string = '' - -@sys.description('Optional. ClientId for the registered Relying Party used to issue WVD SSO certificates.') -param ssoClientId string = '' - -@sys.description('Optional. Path to Azure KeyVault storing the secret used for communication to ADFS.') -#disable-next-line secure-secrets-in-params -param ssoClientSecretKeyVaultPath string = '' - -@sys.description('Optional. The type of single sign on Secret Type.') -@allowed([ - '' - 'Certificate' - 'CertificateInKeyVault' - 'SharedKey' - 'SharedKeyInKeyVault' -]) -#disable-next-line secure-secrets-in-params -param ssoSecretType string = '' - -@sys.description('Optional. The name of logs that will be streamed. "allLogs" includes all possible logs for the resource.') -@allowed([ - 'allLogs' - 'Checkpoint' - 'Error' - 'Management' - 'Connection' - 'HostRegistration' - 'AgentHealthStatus' -]) -param diagnosticLogCategoriesToEnable array = [ - 'allLogs' -] - -@sys.description('Optional. The name of the diagnostic setting, if deployed. If left empty, it defaults to "-diagnosticSettings".') -param diagnosticSettingsName string = '' - -var diagnosticsLogsSpecified = [for category in filter(diagnosticLogCategoriesToEnable, item => item != 'allLogs'): { - category: category - enabled: true - retentionPolicy: { - enabled: true - days: diagnosticLogsRetentionInDays - } -}] - -var diagnosticsLogs = contains(diagnosticLogCategoriesToEnable, 'allLogs') ? [ - { - categoryGroup: 'allLogs' - enabled: true - retentionPolicy: { - enabled: true - days: diagnosticLogsRetentionInDays - } - } -] : diagnosticsLogsSpecified - -var tokenExpirationTime = dateTimeAdd(baseTime, tokenValidityLength) - -resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { - name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name, location)}' - properties: { - mode: 'Incremental' - template: { - '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' - contentVersion: '1.0.0.0' - resources: [] - } - } -} - -resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2022-09-09' = { - name: name - location: location - tags: tags - properties: { - friendlyName: friendlyName - description: description - hostPoolType: type - customRdpProperty: customRdpProperty - personalDesktopAssignmentType: any(personalDesktopAssignmentType) - preferredAppGroupType: preferredAppGroupType - maxSessionLimit: maxSessionLimit - loadBalancerType: loadBalancerType - startVMOnConnect: startVMOnConnect - validationEnvironment: validationEnvironment - registrationInfo: { - expirationTime: tokenExpirationTime - token: null - registrationTokenOperation: 'Update' - } - vmTemplate: ((!empty(vmTemplate)) ? null : string(vmTemplate)) - agentUpdate: agentUpdate - ring: ring != -1 ? ring : null - ssoadfsAuthority: ssoadfsAuthority - ssoClientId: ssoClientId - ssoClientSecretKeyVaultPath: ssoClientSecretKeyVaultPath - ssoSecretType: !empty(ssoSecretType) ? ssoSecretType : null - } -} - -resource hostPool_lock 'Microsoft.Authorization/locks@2020-05-01' = if (!empty(lock)) { - name: '${hostPool.name}-${lock}-lock' - properties: { - level: any(lock) - notes: lock == 'CanNotDelete' ? 'Cannot delete resource or child resources.' : 'Cannot modify the resource or child resources.' - } - scope: hostPool -} - -resource hostPool_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@2021-05-01-preview' = if ((!empty(diagnosticStorageAccountId)) || (!empty(diagnosticWorkspaceId)) || (!empty(diagnosticEventHubAuthorizationRuleId)) || (!empty(diagnosticEventHubName))) { - name: !empty(diagnosticSettingsName) ? diagnosticSettingsName : '${name}-diagnosticSettings' - properties: { - storageAccountId: !empty(diagnosticStorageAccountId) ? diagnosticStorageAccountId : null - workspaceId: !empty(diagnosticWorkspaceId) ? diagnosticWorkspaceId : null - eventHubAuthorizationRuleId: !empty(diagnosticEventHubAuthorizationRuleId) ? diagnosticEventHubAuthorizationRuleId : null - eventHubName: !empty(diagnosticEventHubName) ? diagnosticEventHubName : null - logs: diagnosticsLogs - } - scope: hostPool -} - -module hostPool_roleAssignments '.bicep/nested_roleAssignments.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${uniqueString(deployment().name, location)}-HostPool-Rbac-${index}' - params: { - description: contains(roleAssignment, 'description') ? roleAssignment.description : '' - principalIds: roleAssignment.principalIds - principalType: contains(roleAssignment, 'principalType') ? roleAssignment.principalType : '' - roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName - condition: contains(roleAssignment, 'condition') ? roleAssignment.condition : '' - delegatedManagedIdentityResourceId: contains(roleAssignment, 'delegatedManagedIdentityResourceId') ? roleAssignment.delegatedManagedIdentityResourceId : '' - resourceId: hostPool.id - } -}] - -@sys.description('The resource ID of the AVD host pool.') -output resourceId string = hostPool.id - -@sys.description('The resource group the AVD host pool was deployed into.') -output resourceGroupName string = resourceGroup().name - -@sys.description('The name of the AVD host pool.') -output name string = hostPool.name - -@sys.description('The expiration time for the registration token.') -output tokenExpirationTime string = dateTimeAdd(baseTime, tokenValidityLength) - -@sys.description('The location the resource was deployed into.') -output location string = hostPool.location diff --git a/modules/desktop-virtualization/hostpools/readme.md b/modules/desktop-virtualization/hostpools/readme.md deleted file mode 100644 index 71a755bebe..0000000000 --- a/modules/desktop-virtualization/hostpools/readme.md +++ /dev/null @@ -1,519 +0,0 @@ -# AVD Host Pools `[Microsoft.DesktopVirtualization/hostpools]` - -This module deploys an Azure virtual desktop host pool. - -## Navigation - -- [Resource types](#Resource-types) -- [Parameters](#Parameters) -- [Outputs](#Outputs) -- [Cross-referenced modules](#Cross-referenced-modules) -- [Deployment examples](#Deployment-examples) - -## Resource types - -| Resource Type | API Version | -| :-- | :-- | -| `Microsoft.Authorization/locks` | [2020-05-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2020-05-01/locks) | -| `Microsoft.Authorization/roleAssignments` | [2022-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments) | -| `Microsoft.DesktopVirtualization/hostPools` | [2022-09-09](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2022-09-09/hostPools) | -| `Microsoft.Insights/diagnosticSettings` | [2021-05-01-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) | - -## Parameters - -**Required parameters** - -| Parameter Name | Type | Description | -| :-- | :-- | :-- | -| `name` | string | Name of the Host Pool. | - -**Optional parameters** - -| Parameter Name | Type | Default Value | Allowed Values | Description | -| :-- | :-- | :-- | :-- | :-- | -| `agentUpdate` | object | `{object}` | | The session host configuration for updating agent, monitoring agent, and stack component. | -| `customRdpProperty` | string | `'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;'` | | Host Pool RDP properties. | -| `description` | string | `''` | | The description of the Host Pool to be created. | -| `diagnosticEventHubAuthorizationRuleId` | string | `''` | | Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | -| `diagnosticEventHubName` | string | `''` | | Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | -| `diagnosticLogCategoriesToEnable` | array | `[allLogs]` | `[AgentHealthStatus, allLogs, Checkpoint, Connection, Error, HostRegistration, Management]` | The name of logs that will be streamed. "allLogs" includes all possible logs for the resource. | -| `diagnosticLogsRetentionInDays` | int | `365` | | Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | -| `diagnosticSettingsName` | string | `''` | | The name of the diagnostic setting, if deployed. If left empty, it defaults to "-diagnosticSettings". | -| `diagnosticStorageAccountId` | string | `''` | | Resource ID of the diagnostic storage account. | -| `diagnosticWorkspaceId` | string | `''` | | Resource ID of the diagnostic log analytics workspace. | -| `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via a Globally Unique Identifier (GUID). | -| `friendlyName` | string | `''` | | The friendly name of the Host Pool to be created. | -| `loadBalancerType` | string | `'BreadthFirst'` | `[BreadthFirst, DepthFirst, Persistent]` | Type of load balancer algorithm. | -| `location` | string | `[resourceGroup().location]` | | Location for all resources. | -| `lock` | string | `''` | `['', CanNotDelete, ReadOnly]` | Specify the type of lock. | -| `maxSessionLimit` | int | `99999` | | Maximum number of sessions. | -| `personalDesktopAssignmentType` | string | `''` | `['', Automatic, Direct]` | Set the type of assignment for a Personal Host Pool type. | -| `preferredAppGroupType` | string | `'Desktop'` | `[Desktop, None, RailApplications]` | The type of preferred application group type, default to Desktop Application Group. | -| `ring` | int | `-1` | | The ring number of HostPool. | -| `roleAssignments` | array | `[]` | | Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalIds' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'. | -| `ssoadfsAuthority` | string | `''` | | URL to customer ADFS server for signing WVD SSO certificates. | -| `ssoClientId` | string | `''` | | ClientId for the registered Relying Party used to issue WVD SSO certificates. | -| `ssoClientSecretKeyVaultPath` | string | `''` | | Path to Azure KeyVault storing the secret used for communication to ADFS. | -| `ssoSecretType` | string | `''` | `['', Certificate, CertificateInKeyVault, SharedKey, SharedKeyInKeyVault]` | The type of single sign on Secret Type. | -| `startVMOnConnect` | bool | `False` | | Enable Start VM on connect to allow users to start the virtual machine from a deallocated state. Important: Custom RBAC role required to power manage VMs. | -| `tags` | object | `{object}` | | Tags of the resource. | -| `tokenValidityLength` | string | `'PT8H'` | | Host Pool token validity length. Usage: 'PT8H' - valid for 8 hours; 'P5D' - valid for 5 days; 'P1Y' - valid for 1 year. When not provided, the token will be valid for 8 hours. | -| `type` | string | `'Pooled'` | `[Personal, Pooled]` | Set this parameter to Personal if you would like to enable Persistent Desktop experience. Defaults to Pooled. | -| `validationEnvironment` | bool | `False` | | Validation host pools allows you to test service changes before they are deployed to production. When set to true, the Host Pool will be deployed in a validation 'ring' (environment) that receives all the new features (might be less stable). Defaults to false that stands for the stable, production-ready environment. | -| `vmTemplate` | object | `{object}` | | The necessary information for adding more VMs to this Host Pool. | - -**Generated parameters** - -| Parameter Name | Type | Default Value | Description | -| :-- | :-- | :-- | :-- | -| `baseTime` | string | `[utcNow('u')]` | Do not provide a value! This date value is used to generate a registration token. | - - -### Parameter Usage: `roleAssignments` - -Create a role assignment for the given resource. If you want to assign a service principal / managed identity that is created in the same deployment, make sure to also specify the `'principalType'` parameter and set it to `'ServicePrincipal'`. This will ensure the role assignment waits for the principal's propagation in Azure. - -

- -Parameter JSON format - -```json -"roleAssignments": { - "value": [ - { - "roleDefinitionIdOrName": "Reader", - "description": "Reader Role Assignment", - "principalIds": [ - "12345678-1234-1234-1234-123456789012", // object 1 - "78945612-1234-1234-1234-123456789012" // object 2 - ] - }, - { - "roleDefinitionIdOrName": "/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11", - "principalIds": [ - "12345678-1234-1234-1234-123456789012" // object 1 - ], - "principalType": "ServicePrincipal" - } - ] -} -``` - -
- -
- -Bicep format - -```bicep -roleAssignments: [ - { - roleDefinitionIdOrName: 'Reader' - description: 'Reader Role Assignment' - principalIds: [ - '12345678-1234-1234-1234-123456789012' // object 1 - '78945612-1234-1234-1234-123456789012' // object 2 - ] - } - { - roleDefinitionIdOrName: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' - principalIds: [ - '12345678-1234-1234-1234-123456789012' // object 1 - ] - principalType: 'ServicePrincipal' - } -] -``` - -
-

- -### Parameter Usage: `vmTemplate` - -The below parameter object is converted to an in-line string when handed over to the resource deployment, since that only takes strings. - -

- -Parameter JSON format - -```json -"vmTemplate": { - "value": { - "domain": ".com", - "galleryImageOffer": "office-365", - "galleryImagePublisher": "microsoftwindowsdesktop", - "galleryImageSKU": "19h2-evd-o365pp", - "imageType": "Gallery", - "imageUri": null, - "customImageId": null, - "namePrefix": "AVDv2", - "osDiskType": "StandardSSD_LRS", - "useManagedDisks": true, - "vmSize": { - "id": "Standard_D2s_v3", - "cores": 2, - "ram": 8 - } - } -} -``` - -
- -
- -Bicep format - -```bicep -vmTemplate: { - domain: '.com' - galleryImageOffer: 'office-365' - galleryImagePublisher: 'microsoftwindowsdesktop' - galleryImageSKU: '19h2-evd-o365pp' - imageType: 'Gallery' - imageUri: null - customImageId: null - namePrefix: 'AVDv2' - osDiskType: 'StandardSSD_LRS' - useManagedDisks: true - vmSize: { - id: 'Standard_D2s_v3' - cores: 2 - ram: 8 - } -} -``` - -
-

- -### Parameter Usage: `customRdpProperty` - -

- -Parameter JSON format - -```json -"customRdpProperty": { - "value": "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;" -} -``` - -
- -
- -Bicep format - -```bicep -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;' -``` - -
-

- -### Parameter Usage: `tags` - -Tag names and tag values can be provided as needed. A tag can be left without a value. - -

- -Parameter JSON format - -```json -"tags": { - "value": { - "Environment": "Non-Prod", - "Contact": "test.user@testcompany.com", - "PurchaseOrder": "1234", - "CostCenter": "7890", - "ServiceName": "DeploymentValidation", - "Role": "DeploymentValidation" - } -} -``` - -
- -
- -Bicep format - -```bicep -tags: { - Environment: 'Non-Prod' - Contact: 'test.user@testcompany.com' - PurchaseOrder: '1234' - CostCenter: '7890' - ServiceName: 'DeploymentValidation' - Role: 'DeploymentValidation' -} -``` - -
-

- -## Outputs - -| Output Name | Type | Description | -| :-- | :-- | :-- | -| `location` | string | The location the resource was deployed into. | -| `name` | string | The name of the AVD host pool. | -| `resourceGroupName` | string | The resource group the AVD host pool was deployed into. | -| `resourceId` | string | The resource ID of the AVD host pool. | -| `tokenExpirationTime` | string | The expiration time for the registration token. | - -## Cross-referenced modules - -_None_ - -## Deployment examples - -The following module usage examples are retrieved from the content of the files hosted in the module's `.test` folder. - >**Note**: The name of each example is based on the name of the file from which it is taken. - - >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order. - -

Example 1: Common

- -
- -via Bicep module - -```bicep -module hostpools './Microsoft.DesktopVirtualization/hostpools/deploy.bicep' = { - name: '${uniqueString(deployment().name, location)}-test-dvhpcom' - params: { - // Required parameters - name: '<>dvhpcom001' - // Non-required parameters - agentUpdate: { - maintenanceWindows: [ - { - dayOfWeek: 'Friday' - hour: 7 - } - { - dayOfWeek: 'Saturday' - hour: 8 - } - ] - maintenanceWindowTimeZone: 'Alaskan Standard Time' - type: 'Scheduled' - useSessionHostLocalTime: false - } - 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;' - description: 'My first AVD Host Pool' - diagnosticEventHubAuthorizationRuleId: '' - diagnosticEventHubName: '' - diagnosticLogsRetentionInDays: 7 - diagnosticStorageAccountId: '' - diagnosticWorkspaceId: '' - enableDefaultTelemetry: '' - friendlyName: 'AVDv2' - loadBalancerType: 'BreadthFirst' - location: '' - lock: 'CanNotDelete' - maxSessionLimit: 99999 - personalDesktopAssignmentType: 'Automatic' - roleAssignments: [ - { - principalIds: [ - '' - ] - principalType: 'ServicePrincipal' - roleDefinitionIdOrName: 'Reader' - } - ] - tags: { - Environment: 'Non-Prod' - Role: 'DeploymentValidation' - } - type: 'Pooled' - vmTemplate: { - customImageId: '' - domain: 'domainname.onmicrosoft.com' - galleryImageOffer: 'office-365' - galleryImagePublisher: 'microsoftwindowsdesktop' - galleryImageSKU: '20h1-evd-o365pp' - imageType: 'Gallery' - imageUri: '' - namePrefix: 'avdv2' - osDiskType: 'StandardSSD_LRS' - useManagedDisks: true - vmSize: { - cores: 2 - id: 'Standard_D2s_v3' - ram: 8 - } - } - } -} -``` - -
-

- -

- -via JSON Parameter file - -```json -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - // Required parameters - "name": { - "value": "<>dvhpcom001" - }, - // Non-required parameters - "agentUpdate": { - "value": { - "maintenanceWindows": [ - { - "dayOfWeek": "Friday", - "hour": 7 - }, - { - "dayOfWeek": "Saturday", - "hour": 8 - } - ], - "maintenanceWindowTimeZone": "Alaskan Standard Time", - "type": "Scheduled", - "useSessionHostLocalTime": false - } - }, - "customRdpProperty": { - "value": "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;" - }, - "description": { - "value": "My first AVD Host Pool" - }, - "diagnosticEventHubAuthorizationRuleId": { - "value": "" - }, - "diagnosticEventHubName": { - "value": "" - }, - "diagnosticLogsRetentionInDays": { - "value": 7 - }, - "diagnosticStorageAccountId": { - "value": "" - }, - "diagnosticWorkspaceId": { - "value": "" - }, - "enableDefaultTelemetry": { - "value": "" - }, - "friendlyName": { - "value": "AVDv2" - }, - "loadBalancerType": { - "value": "BreadthFirst" - }, - "location": { - "value": "" - }, - "lock": { - "value": "CanNotDelete" - }, - "maxSessionLimit": { - "value": 99999 - }, - "personalDesktopAssignmentType": { - "value": "Automatic" - }, - "roleAssignments": { - "value": [ - { - "principalIds": [ - "" - ], - "principalType": "ServicePrincipal", - "roleDefinitionIdOrName": "Reader" - } - ] - }, - "tags": { - "value": { - "Environment": "Non-Prod", - "Role": "DeploymentValidation" - } - }, - "type": { - "value": "Pooled" - }, - "vmTemplate": { - "value": { - "customImageId": "", - "domain": "domainname.onmicrosoft.com", - "galleryImageOffer": "office-365", - "galleryImagePublisher": "microsoftwindowsdesktop", - "galleryImageSKU": "20h1-evd-o365pp", - "imageType": "Gallery", - "imageUri": "", - "namePrefix": "avdv2", - "osDiskType": "StandardSSD_LRS", - "useManagedDisks": true, - "vmSize": { - "cores": 2, - "id": "Standard_D2s_v3", - "ram": 8 - } - } - } - } -} -``` - -
-

- -

Example 2: Min

- -
- -via Bicep module - -```bicep -module hostpools './Microsoft.DesktopVirtualization/hostpools/deploy.bicep' = { - name: '${uniqueString(deployment().name, location)}-test-dvhpmin' - params: { - // Required parameters - name: '<>dvhpmin001' - // Non-required parameters - enableDefaultTelemetry: '' - } -} -``` - -
-

- -

- -via JSON Parameter file - -```json -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - // Required parameters - "name": { - "value": "<>dvhpmin001" - }, - // Non-required parameters - "enableDefaultTelemetry": { - "value": "" - } - } -} -``` - -
-

diff --git a/modules/desktop-virtualization/hostpools/version.json b/modules/desktop-virtualization/hostpools/version.json deleted file mode 100644 index 56f8d9ca40..0000000000 --- a/modules/desktop-virtualization/hostpools/version.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "0.4" -} diff --git a/modules/desktop-virtualization/scalingplans/.bicep/nested_roleAssignments.bicep b/modules/desktop-virtualization/scalingplans/.bicep/nested_roleAssignments.bicep deleted file mode 100644 index 517b6b8cdc..0000000000 --- a/modules/desktop-virtualization/scalingplans/.bicep/nested_roleAssignments.bicep +++ /dev/null @@ -1,82 +0,0 @@ -@sys.description('Required. The IDs of the principals to assign the role to.') -param principalIds array - -@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.') -param roleDefinitionIdOrName string - -@sys.description('Required. The resource ID of the resource to apply the role assignment to.') -param resourceId string - -@sys.description('Optional. The principal type of the assigned principal ID.') -@allowed([ - 'ServicePrincipal' - 'Group' - 'User' - 'ForeignGroup' - 'Device' - '' -]) -param principalType string = '' - -@sys.description('Optional. The description of the role assignment.') -param description string = '' - -@sys.description('Optional. The conditions on the role assignment. This limits the resources it can be assigned to. e.g.: @Resource[Microsoft.Storage/storageAccounts/blobServices/containers:ContainerName] StringEqualsIgnoreCase "foo_storage_container".') -param condition string = '' - -@sys.description('Optional. Version of the condition.') -@allowed([ - '2.0' -]) -param conditionVersion string = '2.0' - -@sys.description('Optional. Id of the delegated managed identity resource.') -param delegatedManagedIdentityResourceId string = '' - -var builtInRoleNames = { - 'Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ca6382a4-1721-4bcf-a114-ff0c70227b6b') - Contributor: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c') - 'Desktop Virtualization Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '86240b0e-9422-4c43-887b-b61143f32ba8') - 'Desktop Virtualization Application Group Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'aebf23d0-b568-4e86-b8f9-fe83a2c6ab55') - 'Desktop Virtualization Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '082f0a83-3be5-4ba1-904c-961cca79b387') - 'Desktop Virtualization Host Pool Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e307426c-f9b6-4e81-87de-d99efb3c32bc') - 'Desktop Virtualization Host Pool Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ceadfde2-b300-400a-ab7b-6143895aa822') - 'Desktop Virtualization Power On Off Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '40c5ff49-9181-41f8-ae61-143b0e78555e') - 'Desktop Virtualization Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '49a72310-ab8d-41df-bbb0-79b649203868') - 'Desktop Virtualization Session Host Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2ad6aaab-ead9-4eaa-8ac5-da422f562408') - 'Desktop Virtualization User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '1d18fff3-a72a-46b5-b4a9-0b38a3cd7e63') - 'Desktop Virtualization User Session Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ea4bfff8-7fb4-485a-aadd-d4129a0ffaa6') - 'Desktop Virtualization Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a959dbd1-f747-45e3-8ba6-dd80f235f97c') - 'Desktop Virtualization Workspace Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21efdde3-836f-432b-bf3d-3e8e734d4b2b') - 'Desktop Virtualization Workspace Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0fa44ee9-7a7d-466b-9bb2-2bf446b1204d') - 'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293') - 'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893') - 'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e') - 'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae') - 'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44') - 'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa') - 'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05') - Owner: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635') - Reader: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7') - 'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608') - 'Role Based Access Control Administrator (Preview)': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f58310d9-a9f6-439a-9e8d-f62e7b41a168') - 'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9') -} - -resource scalingPlan 'Microsoft.DesktopVirtualization/scalingPlans@2022-09-09' existing = { - name: last(split(resourceId, '/'))! -} - -resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = [for principalId in principalIds: { - name: guid(scalingPlan.id, principalId, roleDefinitionIdOrName) - properties: { - description: description - roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName - principalId: principalId - principalType: !empty(principalType) ? any(principalType) : null - condition: !empty(condition) ? condition : null - conditionVersion: !empty(conditionVersion) && !empty(condition) ? conditionVersion : null - delegatedManagedIdentityResourceId: !empty(delegatedManagedIdentityResourceId) ? delegatedManagedIdentityResourceId : null - } - scope: scalingPlan -}] diff --git a/modules/desktop-virtualization/scalingplans/.test/common/dependencies.bicep b/modules/desktop-virtualization/scalingplans/.test/common/dependencies.bicep deleted file mode 100644 index 7371d4437b..0000000000 --- a/modules/desktop-virtualization/scalingplans/.test/common/dependencies.bicep +++ /dev/null @@ -1,14 +0,0 @@ -@description('Optional. The location to deploy to.') -param location string = resourceGroup().location - -@description('Required. The name of the Managed Identity to create.') -param managedIdentityName string - -resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { - name: managedIdentityName - location: location -} - -@description('The principal ID of the created Managed Identity.') -output managedIdentityPrincipalId string = managedIdentity.properties.principalId - diff --git a/modules/desktop-virtualization/scalingplans/.test/common/deploy.test.bicep b/modules/desktop-virtualization/scalingplans/.test/common/deploy.test.bicep deleted file mode 100644 index dbc7e02f62..0000000000 --- a/modules/desktop-virtualization/scalingplans/.test/common/deploy.test.bicep +++ /dev/null @@ -1,85 +0,0 @@ -targetScope = 'subscription' - -// ========== // -// 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 - -// ============ // -// 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-<>-msi-${serviceShort}' - } -} - -// Diagnostics -// =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { - scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' - params: { - storageAccountName: 'dep<>diasa${serviceShort}01' - logAnalyticsWorkspaceName: 'dep-<>-law-${serviceShort}' - eventHubNamespaceEventHubName: 'dep-<>-evh-${serviceShort}' - eventHubNamespaceName: 'dep-<>-evhns-${serviceShort}' - location: location - } -} - -// ============== // -// Test Execution // -// ============== // - -module testDeployment '../../deploy.bicep' = { - scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' - params: { - enableDefaultTelemetry: enableDefaultTelemetry - name: '<>${serviceShort}001' - roleAssignments: [ - { - roleDefinitionIdOrName: 'Reader' - principalIds: [ - nestedDependencies.outputs.managedIdentityPrincipalId - ] - principalType: 'ServicePrincipal' - } - ] - diagnosticLogsRetentionInDays: 7 - diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId - diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId - diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId - diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName - tags: { - Environment: 'Non-Prod' - Role: 'DeploymentValidation' - } - hostPoolType: 'Pooled' - friendlyName: 'My Scaling Plan' - description: 'My Scaling Plan Description' - } -} diff --git a/modules/desktop-virtualization/scalingplans/.test/min/deploy.test.bicep b/modules/desktop-virtualization/scalingplans/.test/min/deploy.test.bicep deleted file mode 100644 index 9ca3365a0a..0000000000 --- a/modules/desktop-virtualization/scalingplans/.test/min/deploy.test.bicep +++ /dev/null @@ -1,42 +0,0 @@ -targetScope = 'subscription' - -// ========== // -// 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 = 'dvspmin' - -@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true - -// ============ // -// Dependencies // -// ============ // - -// General resources -// ================= -resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { - name: resourceGroupName - location: location -} - -// ============== // -// Test Execution // -// ============== // - -module testDeployment '../../deploy.bicep' = { - scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' - params: { - enableDefaultTelemetry: enableDefaultTelemetry - name: '<>${serviceShort}001' - } -} diff --git a/modules/desktop-virtualization/scalingplans/deploy.bicep b/modules/desktop-virtualization/scalingplans/deploy.bicep deleted file mode 100644 index f8ea70b1eb..0000000000 --- a/modules/desktop-virtualization/scalingplans/deploy.bicep +++ /dev/null @@ -1,188 +0,0 @@ -@sys.description('Required. Name of the scaling plan.') -@minLength(1) -param name string - -@sys.description('Optional. Location for all resources.') -param location string = resourceGroup().location - -@sys.description('Optional. Friendly Name of the scaling plan.') -param friendlyName string = name - -@sys.description('Optional. Description of the scaling plan.') -param description string = name - -@sys.description('Optional. Timezone to be used for the scaling plan.') -param timeZone string = 'W. Europe Standard Time' - -@allowed([ - 'Pooled' -]) -@sys.description('Optional. The type of hostpool where this scaling plan should be applied.') -param hostPoolType string = 'Pooled' - -@sys.description('Optional. Provide a tag to be used for hosts that should not be affected by the scaling plan.') -param exclusionTag string = '' - -@sys.description('Optional. The schedules related to this scaling plan. If no value is provided a default schedule will be provided.') -param schedules array = [ - { - 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' - } -] - -@sys.description('Optional. An array of references to hostpools.') -param hostPoolReferences array = [] - -@sys.description('Optional. Tags of the resource.') -param tags object = {} - -@sys.description('Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely.') -@minValue(0) -@maxValue(365) -param diagnosticLogsRetentionInDays int = 365 - -@sys.description('Optional. Resource ID of the diagnostic storage account.') -param diagnosticStorageAccountId string = '' - -@sys.description('Optional. Resource ID of the diagnostic log analytics workspace.') -param diagnosticWorkspaceId string = '' - -@sys.description('Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to.') -param diagnosticEventHubAuthorizationRuleId string = '' - -@sys.description('Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category.') -param diagnosticEventHubName string = '' - -@sys.description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalIds\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'.') -param roleAssignments array = [] - -@sys.description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true - -@sys.description('Optional. The name of logs that will be streamed. "allLogs" includes all possible logs for the resource.') -@allowed([ - 'allLogs' - 'Autoscale' -]) -param diagnosticLogCategoriesToEnable array = [ - 'allLogs' -] - -var diagnosticsLogsSpecified = [for category in filter(diagnosticLogCategoriesToEnable, item => item != 'allLogs'): { - category: category - enabled: true - retentionPolicy: { - enabled: true - days: diagnosticLogsRetentionInDays - } -}] - -var diagnosticsLogs = contains(diagnosticLogCategoriesToEnable, 'allLogs') ? [ - { - categoryGroup: 'allLogs' - enabled: true - retentionPolicy: { - enabled: true - days: diagnosticLogsRetentionInDays - } - } -] : diagnosticsLogsSpecified - -resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { - name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name, location)}' - properties: { - mode: 'Incremental' - template: { - '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' - contentVersion: '1.0.0.0' - resources: [] - } - } -} - -resource scalingPlan 'Microsoft.DesktopVirtualization/scalingPlans@2022-09-09' = { - name: name - location: location - tags: tags - properties: { - friendlyName: friendlyName - timeZone: timeZone - hostPoolType: hostPoolType - exclusionTag: exclusionTag - schedules: schedules - hostPoolReferences: hostPoolReferences - description: description - } -} - -resource scalingplan_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@2021-05-01-preview' = if ((!empty(diagnosticStorageAccountId)) || (!empty(diagnosticWorkspaceId)) || (!empty(diagnosticEventHubAuthorizationRuleId)) || (!empty(diagnosticEventHubName))) { - name: '${scalingPlan.name}-diagnosticsetting' - properties: { - storageAccountId: !empty(diagnosticStorageAccountId) ? diagnosticStorageAccountId : null - workspaceId: !empty(diagnosticWorkspaceId) ? diagnosticWorkspaceId : null - eventHubAuthorizationRuleId: !empty(diagnosticEventHubAuthorizationRuleId) ? diagnosticEventHubAuthorizationRuleId : null - eventHubName: !empty(diagnosticEventHubName) ? diagnosticEventHubName : null - logs: diagnosticsLogs - } - scope: scalingPlan -} - -module scalingplan_roleAssignments '.bicep/nested_roleAssignments.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${uniqueString(deployment().name, location)}-Workspace-Rbac-${index}' - params: { - description: contains(roleAssignment, 'description') ? roleAssignment.description : '' - principalIds: roleAssignment.principalIds - principalType: contains(roleAssignment, 'principalType') ? roleAssignment.principalType : '' - roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName - condition: contains(roleAssignment, 'condition') ? roleAssignment.condition : '' - delegatedManagedIdentityResourceId: contains(roleAssignment, 'delegatedManagedIdentityResourceId') ? roleAssignment.delegatedManagedIdentityResourceId : '' - resourceId: scalingPlan.id - } -}] - -@sys.description('The resource ID of the AVD scaling plan.') -output resourceId string = scalingPlan.id - -@sys.description('The resource group the AVD scaling plan was deployed into.') -output resourceGroupName string = resourceGroup().name - -@sys.description('The name of the AVD scaling plan.') -output name string = scalingPlan.name - -@sys.description('The location the resource was deployed into.') -output location string = scalingPlan.location diff --git a/modules/desktop-virtualization/scalingplans/readme.md b/modules/desktop-virtualization/scalingplans/readme.md deleted file mode 100644 index 653d0a165b..0000000000 --- a/modules/desktop-virtualization/scalingplans/readme.md +++ /dev/null @@ -1,423 +0,0 @@ -# AVD Scaling Plans `[Microsoft.DesktopVirtualization/scalingPlans]` - -This module deploys an AVD Scaling Plan. - -## Navigation - -- [Resource Types](#Resource-Types) -- [Parameters](#Parameters) -- [Outputs](#Outputs) -- [Cross-referenced modules](#Cross-referenced-modules) -- [Deployment examples](#Deployment-examples) - -## Resource Types - -| Resource Type | API Version | -| :-- | :-- | -| `Microsoft.Authorization/roleAssignments` | [2022-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments) | -| `Microsoft.DesktopVirtualization/scalingPlans` | [2022-09-09](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2022-09-09/scalingPlans) | -| `Microsoft.Insights/diagnosticSettings` | [2021-05-01-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) | - -## Parameters - -**Required parameters** - -| Parameter Name | Type | Description | -| :-- | :-- | :-- | -| `name` | string | Name of the scaling plan. | - -**Optional parameters** - -| Parameter Name | Type | Default Value | Allowed Values | Description | -| :-- | :-- | :-- | :-- | :-- | -| `description` | string | `[parameters('name')]` | | Description of the scaling plan. | -| `diagnosticEventHubAuthorizationRuleId` | string | `''` | | Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | -| `diagnosticEventHubName` | string | `''` | | Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | -| `diagnosticLogCategoriesToEnable` | array | `[allLogs]` | `[allLogs, Autoscale]` | The name of logs that will be streamed. "allLogs" includes all possible logs for the resource. | -| `diagnosticLogsRetentionInDays` | int | `365` | | Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | -| `diagnosticStorageAccountId` | string | `''` | | Resource ID of the diagnostic storage account. | -| `diagnosticWorkspaceId` | string | `''` | | Resource ID of the diagnostic log analytics workspace. | -| `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via a Globally Unique Identifier (GUID). | -| `exclusionTag` | string | `''` | | Provide a tag to be used for hosts that should not be affected by the scaling plan. | -| `friendlyName` | string | `[parameters('name')]` | | Friendly Name of the scaling plan. | -| `hostPoolReferences` | array | `[]` | | An array of references to hostpools. | -| `hostPoolType` | string | `'Pooled'` | `[Pooled]` | The type of hostpool where this scaling plan should be applied. | -| `location` | string | `[resourceGroup().location]` | | Location for all resources. | -| `roleAssignments` | array | `[]` | | Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalIds' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'. | -| `schedules` | array | `[System.Management.Automation.OrderedHashtable]` | | The schedules related to this scaling plan. If no value is provided a default schedule will be provided. | -| `tags` | object | `{object}` | | Tags of the resource. | -| `timeZone` | string | `'W. Europe Standard Time'` | | Timezone to be used for the scaling plan. | - - -### Parameter Usage: `schedules` - -Multiple schedules can be provided as needed. If a schedule is not provided, a default schedule will be created. - -```json -"schedules" : { - "value": [ - { - "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" - } - ] -} -``` - - - -

- -Bicep format - -```bicep -'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' - } -] -``` - -
-

- -### Parameter Usage: `tags` - -Tag names and tag values can be provided as needed. A tag can be left without a value. - -

- -Parameter JSON format - -```json -"tags": { - "value": { - "Environment": "Non-Prod", - "Contact": "test.user@testcompany.com", - "PurchaseOrder": "1234", - "CostCenter": "7890", - "ServiceName": "DeploymentValidation", - "Role": "DeploymentValidation" - } -} -``` - -
- -
- -Bicep format - -```bicep -tags: { - Environment: 'Non-Prod' - Contact: 'test.user@testcompany.com' - PurchaseOrder: '1234' - CostCenter: '7890' - ServiceName: 'DeploymentValidation' - Role: 'DeploymentValidation' -} -``` - -
-

- -### Parameter Usage: `roleAssignments` - -Create a role assignment for the given resource. If you want to assign a service principal / managed identity that is created in the same deployment, make sure to also specify the `'principalType'` parameter and set it to `'ServicePrincipal'`. This will ensure the role assignment waits for the principal's propagation in Azure. - -

- -Parameter JSON format - -```json -"roleAssignments": { - "value": [ - { - "roleDefinitionIdOrName": "Reader", - "description": "Reader Role Assignment", - "principalIds": [ - "12345678-1234-1234-1234-123456789012", // object 1 - "78945612-1234-1234-1234-123456789012" // object 2 - ] - }, - { - "roleDefinitionIdOrName": "/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11", - "principalIds": [ - "12345678-1234-1234-1234-123456789012" // object 1 - ], - "principalType": "ServicePrincipal" - } - ] -} -``` - -
- -
- -Bicep format - -```bicep -roleAssignments: [ - { - roleDefinitionIdOrName: 'Reader' - description: 'Reader Role Assignment' - principalIds: [ - '12345678-1234-1234-1234-123456789012' // object 1 - '78945612-1234-1234-1234-123456789012' // object 2 - ] - } - { - roleDefinitionIdOrName: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' - principalIds: [ - '12345678-1234-1234-1234-123456789012' // object 1 - ] - principalType: 'ServicePrincipal' - } -] -``` - -
-

- -## Outputs - -| Output Name | Type | Description | -| :-- | :-- | :-- | -| `location` | string | The location the resource was deployed into. | -| `name` | string | The name of the AVD scaling plan. | -| `resourceGroupName` | string | The resource group the AVD scaling plan was deployed into. | -| `resourceId` | string | The resource ID of the AVD scaling plan. | - -## Cross-referenced modules - -_None_ - -## Deployment examples - -The following module usage examples are retrieved from the content of the files hosted in the module's `.test` folder. - >**Note**: The name of each example is based on the name of the file from which it is taken. - - >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order. - -

Example 1: Common

- -
- -via Bicep module - -```bicep -module scalingplans './Microsoft.DesktopVirtualization/scalingplans/deploy.bicep' = { - name: '${uniqueString(deployment().name, location)}-test-dvspcom' - params: { - // Required parameters - name: '<>dvspcom001' - // Non-required parameters - description: 'My Scaling Plan Description' - diagnosticEventHubAuthorizationRuleId: '' - diagnosticEventHubName: '' - diagnosticLogsRetentionInDays: 7 - diagnosticStorageAccountId: '' - diagnosticWorkspaceId: '' - enableDefaultTelemetry: '' - friendlyName: 'My Scaling Plan' - hostPoolType: 'Pooled' - roleAssignments: [ - { - principalIds: [ - '' - ] - principalType: 'ServicePrincipal' - roleDefinitionIdOrName: 'Reader' - } - ] - tags: { - Environment: 'Non-Prod' - Role: 'DeploymentValidation' - } - } -} -``` - -
-

- -

- -via JSON Parameter file - -```json -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - // Required parameters - "name": { - "value": "<>dvspcom001" - }, - // Non-required parameters - "description": { - "value": "My Scaling Plan Description" - }, - "diagnosticEventHubAuthorizationRuleId": { - "value": "" - }, - "diagnosticEventHubName": { - "value": "" - }, - "diagnosticLogsRetentionInDays": { - "value": 7 - }, - "diagnosticStorageAccountId": { - "value": "" - }, - "diagnosticWorkspaceId": { - "value": "" - }, - "enableDefaultTelemetry": { - "value": "" - }, - "friendlyName": { - "value": "My Scaling Plan" - }, - "hostPoolType": { - "value": "Pooled" - }, - "roleAssignments": { - "value": [ - { - "principalIds": [ - "" - ], - "principalType": "ServicePrincipal", - "roleDefinitionIdOrName": "Reader" - } - ] - }, - "tags": { - "value": { - "Environment": "Non-Prod", - "Role": "DeploymentValidation" - } - } - } -} -``` - -
-

- -

Example 2: Min

- -
- -via Bicep module - -```bicep -module scalingplans './Microsoft.DesktopVirtualization/scalingplans/deploy.bicep' = { - name: '${uniqueString(deployment().name, location)}-test-dvspmin' - params: { - // Required parameters - name: '<>dvspmin001' - // Non-required parameters - enableDefaultTelemetry: '' - } -} -``` - -
-

- -

- -via JSON Parameter file - -```json -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - // Required parameters - "name": { - "value": "<>dvspmin001" - }, - // Non-required parameters - "enableDefaultTelemetry": { - "value": "" - } - } -} -``` - -
-

diff --git a/modules/desktop-virtualization/scalingplans/version.json b/modules/desktop-virtualization/scalingplans/version.json deleted file mode 100644 index 56f8d9ca40..0000000000 --- a/modules/desktop-virtualization/scalingplans/version.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "0.4" -} diff --git a/modules/desktop-virtualization/workspaces/.bicep/nested_roleAssignments.bicep b/modules/desktop-virtualization/workspaces/.bicep/nested_roleAssignments.bicep deleted file mode 100644 index 7e2b4e3804..0000000000 --- a/modules/desktop-virtualization/workspaces/.bicep/nested_roleAssignments.bicep +++ /dev/null @@ -1,82 +0,0 @@ -@sys.description('Required. The IDs of the principals to assign the role to.') -param principalIds array - -@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.') -param roleDefinitionIdOrName string - -@sys.description('Required. The resource ID of the resource to apply the role assignment to.') -param resourceId string - -@sys.description('Optional. The principal type of the assigned principal ID.') -@allowed([ - 'ServicePrincipal' - 'Group' - 'User' - 'ForeignGroup' - 'Device' - '' -]) -param principalType string = '' - -@sys.description('Optional. The description of the role assignment.') -param description string = '' - -@sys.description('Optional. The conditions on the role assignment. This limits the resources it can be assigned to. e.g.: @Resource[Microsoft.Storage/storageAccounts/blobServices/containers:ContainerName] StringEqualsIgnoreCase "foo_storage_container".') -param condition string = '' - -@sys.description('Optional. Version of the condition.') -@allowed([ - '2.0' -]) -param conditionVersion string = '2.0' - -@sys.description('Optional. Id of the delegated managed identity resource.') -param delegatedManagedIdentityResourceId string = '' - -var builtInRoleNames = { - 'Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ca6382a4-1721-4bcf-a114-ff0c70227b6b') - Contributor: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c') - 'Desktop Virtualization Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '86240b0e-9422-4c43-887b-b61143f32ba8') - 'Desktop Virtualization Application Group Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'aebf23d0-b568-4e86-b8f9-fe83a2c6ab55') - 'Desktop Virtualization Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '082f0a83-3be5-4ba1-904c-961cca79b387') - 'Desktop Virtualization Host Pool Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e307426c-f9b6-4e81-87de-d99efb3c32bc') - 'Desktop Virtualization Host Pool Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ceadfde2-b300-400a-ab7b-6143895aa822') - 'Desktop Virtualization Power On Off Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '40c5ff49-9181-41f8-ae61-143b0e78555e') - 'Desktop Virtualization Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '49a72310-ab8d-41df-bbb0-79b649203868') - 'Desktop Virtualization Session Host Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2ad6aaab-ead9-4eaa-8ac5-da422f562408') - 'Desktop Virtualization User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '1d18fff3-a72a-46b5-b4a9-0b38a3cd7e63') - 'Desktop Virtualization User Session Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ea4bfff8-7fb4-485a-aadd-d4129a0ffaa6') - 'Desktop Virtualization Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a959dbd1-f747-45e3-8ba6-dd80f235f97c') - 'Desktop Virtualization Workspace Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21efdde3-836f-432b-bf3d-3e8e734d4b2b') - 'Desktop Virtualization Workspace Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0fa44ee9-7a7d-466b-9bb2-2bf446b1204d') - 'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293') - 'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893') - 'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e') - 'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae') - 'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44') - 'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa') - 'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05') - Owner: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635') - Reader: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7') - 'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608') - 'Role Based Access Control Administrator (Preview)': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f58310d9-a9f6-439a-9e8d-f62e7b41a168') - 'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9') -} - -resource workspace 'Microsoft.DesktopVirtualization/workspaces@2022-09-09' existing = { - name: last(split(resourceId, '/'))! -} - -resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = [for principalId in principalIds: { - name: guid(workspace.id, principalId, roleDefinitionIdOrName) - properties: { - description: description - roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName - principalId: principalId - principalType: !empty(principalType) ? any(principalType) : null - condition: !empty(condition) ? condition : null - conditionVersion: !empty(conditionVersion) && !empty(condition) ? conditionVersion : null - delegatedManagedIdentityResourceId: !empty(delegatedManagedIdentityResourceId) ? delegatedManagedIdentityResourceId : null - } - scope: workspace -}] diff --git a/modules/desktop-virtualization/workspaces/.test/common/dependencies.bicep b/modules/desktop-virtualization/workspaces/.test/common/dependencies.bicep deleted file mode 100644 index 8e753087b2..0000000000 --- a/modules/desktop-virtualization/workspaces/.test/common/dependencies.bicep +++ /dev/null @@ -1,41 +0,0 @@ -@description('Optional. The location to deploy to.') -param location string = resourceGroup().location - -@description('Required. The name of the Managed Identity to create.') -param managedIdentityName string - -@description('Required. The name of the Application Group to create.') -param applicationGroupName string - -@description('Required. The name of the Host Pool to create.') -param hostPoolName string - -resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { - name: managedIdentityName - location: location -} - -resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2022-09-09' = { - name: hostPoolName - location: location - properties: { - hostPoolType: 'Pooled' - loadBalancerType: 'BreadthFirst' - preferredAppGroupType: 'Desktop' - } -} - -resource applicationGroup 'Microsoft.DesktopVirtualization/applicationGroups@2022-09-09' = { - name: applicationGroupName - location: location - properties: { - applicationGroupType: 'Desktop' - hostPoolArmPath: hostPool.id - } -} - -@description('The principal ID of the created Managed Identity.') -output managedIdentityPrincipalId string = managedIdentity.properties.principalId - -@description('The resource ID of the created Application Group.') -output applicationGroupResourceId string = applicationGroup.id diff --git a/modules/desktop-virtualization/workspaces/.test/common/deploy.test.bicep b/modules/desktop-virtualization/workspaces/.test/common/deploy.test.bicep deleted file mode 100644 index 4e47af6296..0000000000 --- a/modules/desktop-virtualization/workspaces/.test/common/deploy.test.bicep +++ /dev/null @@ -1,91 +0,0 @@ -targetScope = 'subscription' - -// ========== // -// 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 - -// ============ // -// 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-<>-msi-${serviceShort}' - applicationGroupName: 'dep-<>-appGroup-${serviceShort}' - hostPoolName: 'dep-<>-hp-${serviceShort}' - } -} - -// Diagnostics -// =========== -module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { - scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' - params: { - storageAccountName: 'dep<>diasa${serviceShort}01' - logAnalyticsWorkspaceName: 'dep-<>-law-${serviceShort}' - eventHubNamespaceEventHubName: 'dep-<>-evh-${serviceShort}' - eventHubNamespaceName: 'dep-<>-evhns-${serviceShort}' - location: location - } -} - -// ============== // -// Test Execution // -// ============== // - -module testDeployment '../../deploy.bicep' = { - scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' - params: { - enableDefaultTelemetry: enableDefaultTelemetry - name: '<>${serviceShort}001' - appGroupResourceIds: [ - nestedDependencies.outputs.applicationGroupResourceId - ] - diagnosticLogsRetentionInDays: 7 - diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId - diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId - diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId - diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName - location: location - lock: 'CanNotDelete' - roleAssignments: [ - { - roleDefinitionIdOrName: 'Reader' - principalIds: [ - nestedDependencies.outputs.managedIdentityPrincipalId - ] - principalType: 'ServicePrincipal' - } - ] - tags: { - Environment: 'Non-Prod' - Role: 'DeploymentValidation' - } - description: 'This is my first AVD Workspace' - friendlyName: 'My first AVD Workspace' - } -} diff --git a/modules/desktop-virtualization/workspaces/.test/min/deploy.test.bicep b/modules/desktop-virtualization/workspaces/.test/min/deploy.test.bicep deleted file mode 100644 index e217769c85..0000000000 --- a/modules/desktop-virtualization/workspaces/.test/min/deploy.test.bicep +++ /dev/null @@ -1,42 +0,0 @@ -targetScope = 'subscription' - -// ========== // -// 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 = 'dvwmin' - -@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true - -// ============ // -// Dependencies // -// ============ // - -// General resources -// ================= -resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { - name: resourceGroupName - location: location -} - -// ============== // -// Test Execution // -// ============== // - -module testDeployment '../../deploy.bicep' = { - scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' - params: { - enableDefaultTelemetry: enableDefaultTelemetry - name: '<>${serviceShort}001' - } -} diff --git a/modules/desktop-virtualization/workspaces/deploy.bicep b/modules/desktop-virtualization/workspaces/deploy.bicep deleted file mode 100644 index 840a2b47f6..0000000000 --- a/modules/desktop-virtualization/workspaces/deploy.bicep +++ /dev/null @@ -1,152 +0,0 @@ -@sys.description('Required. The name of the workspace to be attach to new Application Group.') -param name string - -@sys.description('Optional. Location for all resources.') -param location string = resourceGroup().location - -@sys.description('Optional. Resource IDs for the existing Application groups this workspace will group together.') -param appGroupResourceIds array = [] - -@sys.description('Optional. The friendly name of the Workspace to be created.') -param friendlyName string = '' - -@sys.description('Optional. The description of the Workspace to be created.') -param description string = '' - -@sys.description('Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely.') -@minValue(0) -@maxValue(365) -param diagnosticLogsRetentionInDays int = 365 - -@sys.description('Optional. Resource ID of the diagnostic storage account.') -param diagnosticStorageAccountId string = '' - -@sys.description('Optional. Resource ID of the diagnostic log analytics workspace.') -param diagnosticWorkspaceId string = '' - -@sys.description('Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to.') -param diagnosticEventHubAuthorizationRuleId string = '' - -@sys.description('Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category.') -param diagnosticEventHubName string = '' - -@allowed([ - '' - 'CanNotDelete' - 'ReadOnly' -]) -@sys.description('Optional. Specify the type of lock.') -param lock string = '' - -@sys.description('Optional. Tags of the resource.') -param tags object = {} - -@sys.description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') -param enableDefaultTelemetry bool = true - -@sys.description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalIds\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'.') -param roleAssignments array = [] - -@sys.description('Optional. The name of logs that will be streamed. "allLogs" includes all possible logs for the resource.') -@allowed([ - 'allLogs' - 'Checkpoint' - 'Error' - 'Management' - 'Feed' -]) -param diagnosticLogCategoriesToEnable array = [ - 'allLogs' -] - -@sys.description('Optional. The name of the diagnostic setting, if deployed. If left empty, it defaults to "-diagnosticSettings".') -param diagnosticSettingsName string = '' - -var diagnosticsLogsSpecified = [for category in filter(diagnosticLogCategoriesToEnable, item => item != 'allLogs'): { - category: category - enabled: true - retentionPolicy: { - enabled: true - days: diagnosticLogsRetentionInDays - } -}] - -var diagnosticsLogs = contains(diagnosticLogCategoriesToEnable, 'allLogs') ? [ - { - categoryGroup: 'allLogs' - enabled: true - retentionPolicy: { - enabled: true - days: diagnosticLogsRetentionInDays - } - } -] : diagnosticsLogsSpecified - -resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { - name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name, location)}' - properties: { - mode: 'Incremental' - template: { - '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' - contentVersion: '1.0.0.0' - resources: [] - } - } -} - -resource workspace 'Microsoft.DesktopVirtualization/workspaces@2022-09-09' = { - name: name - location: location - tags: tags - properties: { - applicationGroupReferences: appGroupResourceIds - description: description - friendlyName: friendlyName - } -} - -resource workspace_lock 'Microsoft.Authorization/locks@2020-05-01' = if (!empty(lock)) { - name: '${workspace.name}-${lock}-lock' - properties: { - level: any(lock) - notes: lock == 'CanNotDelete' ? 'Cannot delete resource or child resources.' : 'Cannot modify the resource or child resources.' - } - scope: workspace -} - -resource workspace_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@2021-05-01-preview' = if ((!empty(diagnosticStorageAccountId)) || (!empty(diagnosticWorkspaceId)) || (!empty(diagnosticEventHubAuthorizationRuleId)) || (!empty(diagnosticEventHubName))) { - name: !empty(diagnosticSettingsName) ? diagnosticSettingsName : '${name}-diagnosticSettings' - properties: { - storageAccountId: !empty(diagnosticStorageAccountId) ? diagnosticStorageAccountId : null - workspaceId: !empty(diagnosticWorkspaceId) ? diagnosticWorkspaceId : null - eventHubAuthorizationRuleId: !empty(diagnosticEventHubAuthorizationRuleId) ? diagnosticEventHubAuthorizationRuleId : null - eventHubName: !empty(diagnosticEventHubName) ? diagnosticEventHubName : null - logs: diagnosticsLogs - } - scope: workspace -} - -module workspace_roleAssignments '.bicep/nested_roleAssignments.bicep' = [for (roleAssignment, index) in roleAssignments: { - name: '${uniqueString(deployment().name, location)}-Workspace-Rbac-${index}' - params: { - description: contains(roleAssignment, 'description') ? roleAssignment.description : '' - principalIds: roleAssignment.principalIds - principalType: contains(roleAssignment, 'principalType') ? roleAssignment.principalType : '' - roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName - condition: contains(roleAssignment, 'condition') ? roleAssignment.condition : '' - delegatedManagedIdentityResourceId: contains(roleAssignment, 'delegatedManagedIdentityResourceId') ? roleAssignment.delegatedManagedIdentityResourceId : '' - resourceId: workspace.id - } -}] - -@sys.description('The resource ID of the AVD workspace.') -output resourceId string = workspace.id - -@sys.description('The resource group the AVD workspace was deployed into.') -output resourceGroupName string = resourceGroup().name - -@sys.description('The name of the AVD workspace.') -output name string = workspace.name - -@sys.description('The location the resource was deployed into.') -output location string = workspace.location diff --git a/modules/desktop-virtualization/workspaces/readme.md b/modules/desktop-virtualization/workspaces/readme.md deleted file mode 100644 index c8ad45c101..0000000000 --- a/modules/desktop-virtualization/workspaces/readme.md +++ /dev/null @@ -1,333 +0,0 @@ -# AVD Workspaces `[Microsoft.DesktopVirtualization/workspaces]` - -This module deploys an Azure virtual desktop workspace. - -## Navigation - -- [Resource types](#Resource-types) -- [Parameters](#Parameters) -- [Outputs](#Outputs) -- [Cross-referenced modules](#Cross-referenced-modules) -- [Deployment examples](#Deployment-examples) - -## Resource types - -| Resource Type | API Version | -| :-- | :-- | -| `Microsoft.Authorization/locks` | [2020-05-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2020-05-01/locks) | -| `Microsoft.Authorization/roleAssignments` | [2022-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments) | -| `Microsoft.DesktopVirtualization/workspaces` | [2022-09-09](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2022-09-09/workspaces) | -| `Microsoft.Insights/diagnosticSettings` | [2021-05-01-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) | - -## Parameters - -**Required parameters** - -| Parameter Name | Type | Description | -| :-- | :-- | :-- | -| `name` | string | The name of the workspace to be attach to new Application Group. | - -**Optional parameters** - -| Parameter Name | Type | Default Value | Allowed Values | Description | -| :-- | :-- | :-- | :-- | :-- | -| `appGroupResourceIds` | array | `[]` | | Resource IDs for the existing Application groups this workspace will group together. | -| `description` | string | `''` | | The description of the Workspace to be created. | -| `diagnosticEventHubAuthorizationRuleId` | string | `''` | | Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | -| `diagnosticEventHubName` | string | `''` | | Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | -| `diagnosticLogCategoriesToEnable` | array | `[allLogs]` | `[allLogs, Checkpoint, Error, Feed, Management]` | The name of logs that will be streamed. "allLogs" includes all possible logs for the resource. | -| `diagnosticLogsRetentionInDays` | int | `365` | | Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | -| `diagnosticSettingsName` | string | `''` | | The name of the diagnostic setting, if deployed. If left empty, it defaults to "-diagnosticSettings". | -| `diagnosticStorageAccountId` | string | `''` | | Resource ID of the diagnostic storage account. | -| `diagnosticWorkspaceId` | string | `''` | | Resource ID of the diagnostic log analytics workspace. | -| `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via a Globally Unique Identifier (GUID). | -| `friendlyName` | string | `''` | | The friendly name of the Workspace to be created. | -| `location` | string | `[resourceGroup().location]` | | Location for all resources. | -| `lock` | string | `''` | `['', CanNotDelete, ReadOnly]` | Specify the type of lock. | -| `roleAssignments` | array | `[]` | | Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalIds' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'. | -| `tags` | object | `{object}` | | Tags of the resource. | - - -### Parameter Usage: `roleAssignments` - -Create a role assignment for the given resource. If you want to assign a service principal / managed identity that is created in the same deployment, make sure to also specify the `'principalType'` parameter and set it to `'ServicePrincipal'`. This will ensure the role assignment waits for the principal's propagation in Azure. - -

- -Parameter JSON format - -```json -"roleAssignments": { - "value": [ - { - "roleDefinitionIdOrName": "Reader", - "description": "Reader Role Assignment", - "principalIds": [ - "12345678-1234-1234-1234-123456789012", // object 1 - "78945612-1234-1234-1234-123456789012" // object 2 - ] - }, - { - "roleDefinitionIdOrName": "/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11", - "principalIds": [ - "12345678-1234-1234-1234-123456789012" // object 1 - ], - "principalType": "ServicePrincipal" - } - ] -} -``` - -
- -
- -Bicep format - -```bicep -roleAssignments: [ - { - roleDefinitionIdOrName: 'Reader' - description: 'Reader Role Assignment' - principalIds: [ - '12345678-1234-1234-1234-123456789012' // object 1 - '78945612-1234-1234-1234-123456789012' // object 2 - ] - } - { - roleDefinitionIdOrName: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' - principalIds: [ - '12345678-1234-1234-1234-123456789012' // object 1 - ] - principalType: 'ServicePrincipal' - } -] -``` - -
-

- -### Parameter Usage: `tags` - -Tag names and tag values can be provided as needed. A tag can be left without a value. - -

- -Parameter JSON format - -```json -"tags": { - "value": { - "Environment": "Non-Prod", - "Contact": "test.user@testcompany.com", - "PurchaseOrder": "1234", - "CostCenter": "7890", - "ServiceName": "DeploymentValidation", - "Role": "DeploymentValidation" - } -} -``` - -
- -
- -Bicep format - -```bicep -tags: { - Environment: 'Non-Prod' - Contact: 'test.user@testcompany.com' - PurchaseOrder: '1234' - CostCenter: '7890' - ServiceName: 'DeploymentValidation' - Role: 'DeploymentValidation' -} -``` - -
-

- -## Outputs - -| Output Name | Type | Description | -| :-- | :-- | :-- | -| `location` | string | The location the resource was deployed into. | -| `name` | string | The name of the AVD workspace. | -| `resourceGroupName` | string | The resource group the AVD workspace was deployed into. | -| `resourceId` | string | The resource ID of the AVD workspace. | - -## Cross-referenced modules - -_None_ - -## Deployment examples - -The following module usage examples are retrieved from the content of the files hosted in the module's `.test` folder. - >**Note**: The name of each example is based on the name of the file from which it is taken. - - >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order. - -

Example 1: Common

- -
- -via Bicep module - -```bicep -module workspaces './Microsoft.DesktopVirtualization/workspaces/deploy.bicep' = { - name: '${uniqueString(deployment().name, location)}-test-dvwcom' - params: { - // Required parameters - name: '<>dvwcom001' - // Non-required parameters - appGroupResourceIds: [ - '' - ] - description: 'This is my first AVD Workspace' - diagnosticEventHubAuthorizationRuleId: '' - diagnosticEventHubName: '' - diagnosticLogsRetentionInDays: 7 - diagnosticStorageAccountId: '' - diagnosticWorkspaceId: '' - enableDefaultTelemetry: '' - friendlyName: 'My first AVD Workspace' - location: '' - lock: 'CanNotDelete' - roleAssignments: [ - { - principalIds: [ - '' - ] - principalType: 'ServicePrincipal' - roleDefinitionIdOrName: 'Reader' - } - ] - tags: { - Environment: 'Non-Prod' - Role: 'DeploymentValidation' - } - } -} -``` - -
-

- -

- -via JSON Parameter file - -```json -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - // Required parameters - "name": { - "value": "<>dvwcom001" - }, - // Non-required parameters - "appGroupResourceIds": { - "value": [ - "" - ] - }, - "description": { - "value": "This is my first AVD Workspace" - }, - "diagnosticEventHubAuthorizationRuleId": { - "value": "" - }, - "diagnosticEventHubName": { - "value": "" - }, - "diagnosticLogsRetentionInDays": { - "value": 7 - }, - "diagnosticStorageAccountId": { - "value": "" - }, - "diagnosticWorkspaceId": { - "value": "" - }, - "enableDefaultTelemetry": { - "value": "" - }, - "friendlyName": { - "value": "My first AVD Workspace" - }, - "location": { - "value": "" - }, - "lock": { - "value": "CanNotDelete" - }, - "roleAssignments": { - "value": [ - { - "principalIds": [ - "" - ], - "principalType": "ServicePrincipal", - "roleDefinitionIdOrName": "Reader" - } - ] - }, - "tags": { - "value": { - "Environment": "Non-Prod", - "Role": "DeploymentValidation" - } - } - } -} -``` - -
-

- -

Example 2: Min

- -
- -via Bicep module - -```bicep -module workspaces './Microsoft.DesktopVirtualization/workspaces/deploy.bicep' = { - name: '${uniqueString(deployment().name, location)}-test-dvwmin' - params: { - // Required parameters - name: '<>dvwmin001' - // Non-required parameters - enableDefaultTelemetry: '' - } -} -``` - -
-

- -

- -via JSON Parameter file - -```json -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - // Required parameters - "name": { - "value": "<>dvwmin001" - }, - // Non-required parameters - "enableDefaultTelemetry": { - "value": "" - } - } -} -``` - -
-

diff --git a/modules/desktop-virtualization/workspaces/version.json b/modules/desktop-virtualization/workspaces/version.json deleted file mode 100644 index 56f8d9ca40..0000000000 --- a/modules/desktop-virtualization/workspaces/version.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "0.4" -} From 7c8e9e3146cea9e749fbafd04df585e933a20315 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Thu, 4 May 2023 16:39:33 +0200 Subject: [PATCH 08/63] cleanup --- .../staticValidation/module.tests.ps1 | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/utilities/pipelines/staticValidation/module.tests.ps1 b/utilities/pipelines/staticValidation/module.tests.ps1 index fa561410d1..30d7b279ce 100644 --- a/utilities/pipelines/staticValidation/module.tests.ps1 +++ b/utilities/pipelines/staticValidation/module.tests.ps1 @@ -52,38 +52,6 @@ Describe 'File/folder tests' -Tag 'Modules' { } } - # if (Test-Path (Join-Path $repoRootPath '.github')) { - # It '[] Module should have a GitHub workflow' -TestCases ($moduleFolderTestCases | Where-Object { $_.isTopLevelModule }) { - - # param( - # [string] $moduleFolderName, - # [string] $moduleFolderPath - # ) - - # $workflowsFolderName = Join-Path $repoRootPath '.github' 'workflows' - # $workflowFileName = 'ms.{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('-', '').ToLower() - # # $workflowFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() - # $workflowPath = Join-Path $workflowsFolderName $workflowFileName - # Test-Path $workflowPath | Should -Be $true -Because "path [$workflowPath] should exist." - # } - # } - - # if (Test-Path (Join-Path $repoRootPath '.azuredevops')) { - # It '[] Module should have an Azure DevOps pipeline' -TestCases ($moduleFolderTestCases | Where-Object { $_.isTopLevelModule }) { - - # param( - # [string] $moduleFolderName, - # [string] $moduleFolderPath - # ) - - # $pipelinesFolderName = Join-Path $repoRootPath '.azuredevops' 'modulePipelines' - # # $pipelineFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() - # $pipelineFileName = 'ms.{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('-', '').ToLower() - # $pipelinePath = Join-Path $pipelinesFolderName $pipelineFileName - # Test-Path $pipelinePath | Should -Be $true -Because "path [$pipelinePath] should exist." - # } - # } - It '[] Module should contain a [` deploy.json ` / ` deploy.bicep `] file.' -TestCases $moduleFolderTestCases { param( [string] $moduleFolderPath ) From 643982e30ac4aba104c3ff825d0afef434ff0c68 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Thu, 4 May 2023 16:42:10 +0200 Subject: [PATCH 09/63] old folder --- .../.bicep/nested_roleAssignments.bicep | 82 +++ .../.test/common/dependencies.bicep | 29 + .../.test/common/deploy.test.bicep | 107 ++++ .../.test/min/dependencies.bicep | 18 + .../.test/min/deploy.test.bicep | 52 ++ .../applications/deploy.bicep | 77 +++ .../applicationgroups/applications/readme.md | 57 ++ .../applications/version.json | 4 + .../applicationgroups/deploy.bicep | 186 +++++++ .../applicationgroups/readme.md | 382 +++++++++++++ .../applicationgroups/version.json | 4 + .../.bicep/nested_roleAssignments.bicep | 82 +++ .../hostpools/.test/common/dependencies.bicep | 14 + .../hostpools/.test/common/deploy.test.bicep | 123 +++++ .../hostpools/.test/min/deploy.test.bicep | 42 ++ .../hostpools/deploy.bicep | 257 +++++++++ .../hostpools/readme.md | 519 ++++++++++++++++++ .../hostpools/version.json | 4 + .../.bicep/nested_roleAssignments.bicep | 82 +++ .../.test/common/dependencies.bicep | 14 + .../.test/common/deploy.test.bicep | 85 +++ .../scalingplans/.test/min/deploy.test.bicep | 42 ++ .../scalingplans/deploy.bicep | 188 +++++++ .../scalingplans/readme.md | 423 ++++++++++++++ .../scalingplans/version.json | 4 + .../.bicep/nested_roleAssignments.bicep | 82 +++ .../.test/common/dependencies.bicep | 41 ++ .../workspaces/.test/common/deploy.test.bicep | 91 +++ .../workspaces/.test/min/deploy.test.bicep | 42 ++ .../workspaces/deploy.bicep | 152 +++++ .../workspaces/readme.md | 333 +++++++++++ .../workspaces/version.json | 4 + 32 files changed, 3622 insertions(+) create mode 100644 modules/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_roleAssignments.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/applicationgroups/.test/common/dependencies.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/applicationgroups/.test/common/deploy.test.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min/dependencies.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min/deploy.test.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md create mode 100644 modules/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json create mode 100644 modules/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/applicationgroups/readme.md create mode 100644 modules/Microsoft.DesktopVirtualization/applicationgroups/version.json create mode 100644 modules/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_roleAssignments.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/hostpools/.test/common/dependencies.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/hostpools/.test/common/deploy.test.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/hostpools/.test/min/deploy.test.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/hostpools/deploy.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/hostpools/readme.md create mode 100644 modules/Microsoft.DesktopVirtualization/hostpools/version.json create mode 100644 modules/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_roleAssignments.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/scalingplans/.test/common/dependencies.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/scalingplans/.test/common/deploy.test.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/scalingplans/.test/min/deploy.test.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/scalingplans/deploy.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/scalingplans/readme.md create mode 100644 modules/Microsoft.DesktopVirtualization/scalingplans/version.json create mode 100644 modules/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_roleAssignments.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/workspaces/.test/common/dependencies.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/workspaces/deploy.bicep create mode 100644 modules/Microsoft.DesktopVirtualization/workspaces/readme.md create mode 100644 modules/Microsoft.DesktopVirtualization/workspaces/version.json diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_roleAssignments.bicep new file mode 100644 index 0000000000..c7809aafe0 --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_roleAssignments.bicep @@ -0,0 +1,82 @@ +@sys.description('Required. The IDs of the principals to assign the role to.') +param principalIds array + +@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.') +param roleDefinitionIdOrName string + +@sys.description('Required. The resource ID of the resource to apply the role assignment to.') +param resourceId string + +@sys.description('Optional. The principal type of the assigned principal ID.') +@allowed([ + 'ServicePrincipal' + 'Group' + 'User' + 'ForeignGroup' + 'Device' + '' +]) +param principalType string = '' + +@sys.description('Optional. The description of the role assignment.') +param description string = '' + +@sys.description('Optional. The conditions on the role assignment. This limits the resources it can be assigned to. e.g.: @Resource[Microsoft.Storage/storageAccounts/blobServices/containers:ContainerName] StringEqualsIgnoreCase "foo_storage_container".') +param condition string = '' + +@sys.description('Optional. Version of the condition.') +@allowed([ + '2.0' +]) +param conditionVersion string = '2.0' + +@sys.description('Optional. Id of the delegated managed identity resource.') +param delegatedManagedIdentityResourceId string = '' + +var builtInRoleNames = { + 'Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ca6382a4-1721-4bcf-a114-ff0c70227b6b') + Contributor: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c') + 'Desktop Virtualization Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '86240b0e-9422-4c43-887b-b61143f32ba8') + 'Desktop Virtualization Application Group Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'aebf23d0-b568-4e86-b8f9-fe83a2c6ab55') + 'Desktop Virtualization Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '082f0a83-3be5-4ba1-904c-961cca79b387') + 'Desktop Virtualization Host Pool Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e307426c-f9b6-4e81-87de-d99efb3c32bc') + 'Desktop Virtualization Host Pool Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ceadfde2-b300-400a-ab7b-6143895aa822') + 'Desktop Virtualization Power On Off Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '40c5ff49-9181-41f8-ae61-143b0e78555e') + 'Desktop Virtualization Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '49a72310-ab8d-41df-bbb0-79b649203868') + 'Desktop Virtualization Session Host Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2ad6aaab-ead9-4eaa-8ac5-da422f562408') + 'Desktop Virtualization User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '1d18fff3-a72a-46b5-b4a9-0b38a3cd7e63') + 'Desktop Virtualization User Session Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ea4bfff8-7fb4-485a-aadd-d4129a0ffaa6') + 'Desktop Virtualization Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a959dbd1-f747-45e3-8ba6-dd80f235f97c') + 'Desktop Virtualization Workspace Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21efdde3-836f-432b-bf3d-3e8e734d4b2b') + 'Desktop Virtualization Workspace Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0fa44ee9-7a7d-466b-9bb2-2bf446b1204d') + 'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293') + 'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893') + 'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e') + 'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae') + 'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44') + 'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa') + 'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05') + Owner: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635') + Reader: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7') + 'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608') + 'Role Based Access Control Administrator (Preview)': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f58310d9-a9f6-439a-9e8d-f62e7b41a168') + 'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9') +} + +resource appGroup 'Microsoft.DesktopVirtualization/applicationGroups@2022-09-09' existing = { + name: last(split(resourceId, '/'))! +} + +resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = [for principalId in principalIds: { + name: guid(appGroup.id, principalId, roleDefinitionIdOrName) + properties: { + description: description + roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName + principalId: principalId + principalType: !empty(principalType) ? any(principalType) : null + condition: !empty(condition) ? condition : null + conditionVersion: !empty(conditionVersion) && !empty(condition) ? conditionVersion : null + delegatedManagedIdentityResourceId: !empty(delegatedManagedIdentityResourceId) ? delegatedManagedIdentityResourceId : null + } + scope: appGroup +}] diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/common/dependencies.bicep b/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/common/dependencies.bicep new file mode 100644 index 0000000000..41ca94022b --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/common/dependencies.bicep @@ -0,0 +1,29 @@ +@description('Optional. The location to deploy to.') +param location string = resourceGroup().location + +@description('Required. The name of the Managed Identity to create.') +param managedIdentityName string + +@description('Required. The name of the Host Pool to create.') +param hostPoolName string + +resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { + name: managedIdentityName + location: location +} + +resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2022-09-09' = { + name: hostPoolName + location: location + properties: { + hostPoolType: 'Pooled' + loadBalancerType: 'BreadthFirst' + preferredAppGroupType: 'Desktop' + } +} + +@description('The principal ID of the created Managed Identity.') +output managedIdentityPrincipalId string = managedIdentity.properties.principalId + +@description('The name of the created Host Pool.') +output hostPoolName string = hostPool.name diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/common/deploy.test.bicep b/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/common/deploy.test.bicep new file mode 100644 index 0000000000..4eb0f92416 --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/common/deploy.test.bicep @@ -0,0 +1,107 @@ +targetScope = 'subscription' + +// ========== // +// 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 + +// ============ // +// 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-<>-msi-${serviceShort}' + hostPoolName: 'dep-<>-hp-${serviceShort}' + } +} + +// Diagnostics +// =========== +module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' + params: { + storageAccountName: 'dep<>diasa${serviceShort}01' + logAnalyticsWorkspaceName: 'dep-<>-law-${serviceShort}' + eventHubNamespaceEventHubName: 'dep-<>-evh-${serviceShort}' + eventHubNamespaceName: 'dep-<>-evhns-${serviceShort}' + location: location + } +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + params: { + enableDefaultTelemetry: enableDefaultTelemetry + name: '<>${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' + diagnosticLogsRetentionInDays: 7 + diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId + diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId + diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId + diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName + friendlyName: 'Remote Applications 1' + location: location + lock: 'CanNotDelete' + roleAssignments: [ + { + roleDefinitionIdOrName: 'Reader' + principalIds: [ + nestedDependencies.outputs.managedIdentityPrincipalId + ] + principalType: 'ServicePrincipal' + } + ] + tags: { + Environment: 'Non-Prod' + Role: 'DeploymentValidation' + } + } +} diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min/dependencies.bicep b/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min/dependencies.bicep new file mode 100644 index 0000000000..c97eeab034 --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min/dependencies.bicep @@ -0,0 +1,18 @@ +@description('Optional. The location to deploy to.') +param location string = resourceGroup().location + +@description('Required. The name of the Host Pool to create.') +param hostPoolName string + +resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2022-09-09' = { + name: hostPoolName + location: location + properties: { + hostPoolType: 'Pooled' + loadBalancerType: 'BreadthFirst' + preferredAppGroupType: 'Desktop' + } +} + +@description('The name of the created Host Pool.') +output hostPoolName string = hostPool.name diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min/deploy.test.bicep b/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min/deploy.test.bicep new file mode 100644 index 0000000000..518b3e2cc1 --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min/deploy.test.bicep @@ -0,0 +1,52 @@ +targetScope = 'subscription' + +// ========== // +// 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 = 'dvagmin' + +@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +param enableDefaultTelemetry bool = true + +// ============ // +// 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: { + hostPoolName: 'dep-<>-hp-${serviceShort}' + } +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + params: { + enableDefaultTelemetry: enableDefaultTelemetry + name: '<>${serviceShort}001' + applicationGroupType: 'RemoteApp' + hostpoolName: nestedDependencies.outputs.hostPoolName + } +} diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep b/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep new file mode 100644 index 0000000000..d1753d398f --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep @@ -0,0 +1,77 @@ +@sys.description('Conditional. The name of the parent Application Group to create the application(s) in. Required if the template is used in a standalone deployment.') +param appGroupName string + +@sys.description('Required. Name of the Application to be created in the Application Group.') +param name string + +@sys.description('Optional. Description of Application..') +param description string = '' + +@sys.description('Required. Friendly name of Application..') +param friendlyName string + +@sys.description('Required. Specifies a path for the executable file for the application.') +param filePath string + +@allowed([ + 'Allow' + 'DoNotAllow' + 'Require' +]) +@sys.description('Optional. Specifies whether this published application can be launched with command-line arguments provided by the client, command-line arguments specified at publish time, or no command-line arguments at all.') +param commandLineSetting string = 'DoNotAllow' + +@sys.description('Optional. Command-Line Arguments for Application.') +param commandLineArguments string = '' + +@sys.description('Optional. Specifies whether to show the RemoteApp program in the RD Web Access server.') +param showInPortal bool = false + +@sys.description('Optional. Path to icon.') +param iconPath string = '' + +@sys.description('Optional. Index of the icon.') +param iconIndex int = 0 + +@sys.description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +param enableDefaultTelemetry bool = true + +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } +} + +resource applicationGroup 'Microsoft.DesktopVirtualization/applicationGroups@2022-09-09' existing = { + name: appGroupName +} + +resource application 'Microsoft.DesktopVirtualization/applicationGroups/applications@2022-09-09' = { + name: name + parent: applicationGroup + properties: { + description: description + friendlyName: friendlyName + filePath: filePath + commandLineSetting: commandLineSetting + commandLineArguments: commandLineArguments + showInPortal: showInPortal + iconPath: iconPath + iconIndex: iconIndex + } +} + +@sys.description('The resource ID of the deployed Application.') +output resourceId string = application.id + +@sys.description('The name of the Resource Group the AVD Application was created in.') +output resourceGroupName string = resourceGroup().name + +@sys.description('The Name of the Application Group to register the Application in.') +output name string = appGroupName diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md b/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md new file mode 100644 index 0000000000..f506641709 --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md @@ -0,0 +1,57 @@ +# AVD Applications `[Microsoft.DesktopVirtualization/applicationGroups/applications]` + +This module deploys AVD Applications. + +## Navigation + +- [Resource types](#Resource-types) +- [Parameters](#Parameters) +- [Outputs](#Outputs) +- [Cross-referenced modules](#Cross-referenced-modules) + +## Resource types + +| Resource Type | API Version | +| :-- | :-- | +| `Microsoft.DesktopVirtualization/applicationGroups/applications` | [2022-09-09](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2022-09-09/applicationGroups/applications) | + +## Parameters + +**Required parameters** + +| Parameter Name | Type | Description | +| :-- | :-- | :-- | +| `filePath` | string | Specifies a path for the executable file for the application. | +| `friendlyName` | string | Friendly name of Application.. | +| `name` | string | Name of the Application to be created in the Application Group. | + +**Conditional parameters** + +| Parameter Name | Type | Description | +| :-- | :-- | :-- | +| `appGroupName` | string | The name of the parent Application Group to create the application(s) in. Required if the template is used in a standalone deployment. | + +**Optional parameters** + +| Parameter Name | Type | Default Value | Allowed Values | Description | +| :-- | :-- | :-- | :-- | :-- | +| `commandLineArguments` | string | `''` | | Command-Line Arguments for Application. | +| `commandLineSetting` | string | `'DoNotAllow'` | `[Allow, DoNotAllow, Require]` | Specifies whether this published application can be launched with command-line arguments provided by the client, command-line arguments specified at publish time, or no command-line arguments at all. | +| `description` | string | `''` | | Description of Application.. | +| `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via a Globally Unique Identifier (GUID). | +| `iconIndex` | int | `0` | | Index of the icon. | +| `iconPath` | string | `''` | | Path to icon. | +| `showInPortal` | bool | `False` | | Specifies whether to show the RemoteApp program in the RD Web Access server. | + + +## Outputs + +| Output Name | Type | Description | +| :-- | :-- | :-- | +| `name` | string | The Name of the Application Group to register the Application in. | +| `resourceGroupName` | string | The name of the Resource Group the AVD Application was created in. | +| `resourceId` | string | The resource ID of the deployed Application. | + +## Cross-referenced modules + +_None_ diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json b/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json new file mode 100644 index 0000000000..56f8d9ca40 --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", + "version": "0.4" +} diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep b/modules/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep new file mode 100644 index 0000000000..d12d05bd5a --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep @@ -0,0 +1,186 @@ +@sys.description('Required. Name of the Application Group to create this application in.') +@minLength(1) +param name string + +@sys.description('Optional. Location for all resources.') +param location string = resourceGroup().location + +@sys.description('Required. The type of the Application Group to be created. Allowed values: RemoteApp or Desktop.') +@allowed([ + 'RemoteApp' + 'Desktop' +]) +param applicationGroupType string + +@sys.description('Required. Name of the Host Pool to be linked to this Application Group.') +param hostpoolName string + +@sys.description('Optional. The friendly name of the Application Group to be created.') +param friendlyName string = '' + +@sys.description('Optional. The description of the Application Group to be created.') +param description string = '' + +@sys.description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalIds\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'.') +param roleAssignments array = [] + +@sys.description('Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely.') +@minValue(0) +@maxValue(365) +param diagnosticLogsRetentionInDays int = 365 + +@sys.description('Optional. Resource ID of the diagnostic storage account.') +param diagnosticStorageAccountId string = '' + +@sys.description('Optional. Resource ID of log analytics.') +param diagnosticWorkspaceId string = '' + +@sys.description('Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to.') +param diagnosticEventHubAuthorizationRuleId string = '' + +@sys.description('Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category.') +param diagnosticEventHubName string = '' + +@allowed([ + '' + 'CanNotDelete' + 'ReadOnly' +]) +@sys.description('Optional. Specify the type of lock.') +param lock string = '' + +@sys.description('Optional. Tags of the resource.') +param tags object = {} + +@sys.description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +param enableDefaultTelemetry bool = true + +@sys.description('Optional. The name of logs that will be streamed. "allLogs" includes all possible logs for the resource.') +@allowed([ + 'allLogs' + 'Checkpoint' + 'Error' + 'Management' +]) +param diagnosticLogCategoriesToEnable array = [ + 'allLogs' +] + +@sys.description('Optional. List of applications to be created in the Application Group.') +param applications array = [] + +@sys.description('Optional. The name of the diagnostic setting, if deployed. If left empty, it defaults to "-diagnosticSettings".') +param diagnosticSettingsName string = '' + +var diagnosticsLogsSpecified = [for category in filter(diagnosticLogCategoriesToEnable, item => item != 'allLogs'): { + category: category + enabled: true + retentionPolicy: { + enabled: true + days: diagnosticLogsRetentionInDays + } +}] + +var diagnosticsLogs = contains(diagnosticLogCategoriesToEnable, 'allLogs') ? [ + { + categoryGroup: 'allLogs' + enabled: true + retentionPolicy: { + enabled: true + days: diagnosticLogsRetentionInDays + } + } +] : diagnosticsLogsSpecified + +var enableReferencedModulesTelemetry = false + +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name, location)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } +} + +resource appGroup_hostpool 'Microsoft.DesktopVirtualization/hostPools@2022-09-09' existing = { + name: hostpoolName +} + +resource appGroup 'Microsoft.DesktopVirtualization/applicationGroups@2022-09-09' = { + name: name + location: location + tags: tags + properties: { + hostPoolArmPath: appGroup_hostpool.id + friendlyName: friendlyName + description: description + applicationGroupType: applicationGroupType + } +} + +resource appGroup_lock 'Microsoft.Authorization/locks@2020-05-01' = if (!empty(lock)) { + name: '${appGroup.name}-${lock}-lock' + properties: { + level: any(lock) + notes: lock == 'CanNotDelete' ? 'Cannot delete resource or child resources.' : 'Cannot modify the resource or child resources.' + } + scope: appGroup +} + +resource appGroup_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@2021-05-01-preview' = if ((!empty(diagnosticStorageAccountId)) || (!empty(diagnosticWorkspaceId)) || (!empty(diagnosticEventHubAuthorizationRuleId)) || (!empty(diagnosticEventHubName))) { + name: !empty(diagnosticSettingsName) ? diagnosticSettingsName : '${name}-diagnosticSettings' + properties: { + storageAccountId: !empty(diagnosticStorageAccountId) ? diagnosticStorageAccountId : null + workspaceId: !empty(diagnosticWorkspaceId) ? diagnosticWorkspaceId : null + eventHubAuthorizationRuleId: !empty(diagnosticEventHubAuthorizationRuleId) ? diagnosticEventHubAuthorizationRuleId : null + eventHubName: !empty(diagnosticEventHubName) ? diagnosticEventHubName : null + logs: diagnosticsLogs + } + scope: appGroup +} + +module appGroup_applications 'applications/deploy.bicep' = [for (application, index) in applications: { + name: '${uniqueString(deployment().name, location)}-AppGroup-App-${index}' + params: { + name: application.name + appGroupName: appGroup.name + description: contains(application, 'description') ? application.description : '' + friendlyName: contains(application, 'friendlyName') ? application.friendlyName : appGroup.name + filePath: application.filePath + commandLineSetting: contains(application, 'commandLineSetting') ? application.commandLineSetting : 'DoNotAllow' + commandLineArguments: contains(application, 'commandLineArguments') ? application.commandLineArguments : '' + showInPortal: contains(application, 'showInPortal') ? application.showInPortal : false + iconPath: contains(application, 'iconPath') ? application.iconPath : application.filePath + iconIndex: contains(application, 'iconIndex') ? application.iconIndex : 0 + enableDefaultTelemetry: enableReferencedModulesTelemetry + } +}] + +module appGroup_roleAssignments '.bicep/nested_roleAssignments.bicep' = [for (roleAssignment, index) in roleAssignments: { + name: '${uniqueString(deployment().name, location)}-AppGroup-Rbac-${index}' + params: { + description: contains(roleAssignment, 'description') ? roleAssignment.description : '' + principalIds: roleAssignment.principalIds + principalType: contains(roleAssignment, 'principalType') ? roleAssignment.principalType : '' + roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName + condition: contains(roleAssignment, 'condition') ? roleAssignment.condition : '' + delegatedManagedIdentityResourceId: contains(roleAssignment, 'delegatedManagedIdentityResourceId') ? roleAssignment.delegatedManagedIdentityResourceId : '' + resourceId: appGroup.id + } +}] + +@sys.description('The resource ID of the AVD application group.') +output resourceId string = appGroup.id + +@sys.description('The resource group the AVD application group was deployed into.') +output resourceGroupName string = resourceGroup().name + +@sys.description('The name of the AVD application group.') +output name string = appGroup.name + +@sys.description('The location the resource was deployed into.') +output location string = appGroup.location diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/readme.md b/modules/Microsoft.DesktopVirtualization/applicationgroups/readme.md new file mode 100644 index 0000000000..660daf8090 --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/applicationgroups/readme.md @@ -0,0 +1,382 @@ +# AVD Application Groups `[Microsoft.DesktopVirtualization/applicationgroups]` + +This module deploys an Azure virtual desktop application group. + +## Navigation + +- [Resource types](#Resource-types) +- [Parameters](#Parameters) +- [Outputs](#Outputs) +- [Cross-referenced modules](#Cross-referenced-modules) +- [Deployment examples](#Deployment-examples) + +## Resource types + +| Resource Type | API Version | +| :-- | :-- | +| `Microsoft.Authorization/locks` | [2020-05-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2020-05-01/locks) | +| `Microsoft.Authorization/roleAssignments` | [2022-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments) | +| `Microsoft.DesktopVirtualization/applicationGroups` | [2022-09-09](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2022-09-09/applicationGroups) | +| `Microsoft.DesktopVirtualization/applicationGroups/applications` | [2022-09-09](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2022-09-09/applicationGroups/applications) | +| `Microsoft.Insights/diagnosticSettings` | [2021-05-01-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) | + +## Parameters + +**Required parameters** + +| Parameter Name | Type | Allowed Values | Description | +| :-- | :-- | :-- | :-- | +| `applicationGroupType` | string | `[Desktop, RemoteApp]` | The type of the Application Group to be created. Allowed values: RemoteApp or Desktop. | +| `hostpoolName` | string | | Name of the Host Pool to be linked to this Application Group. | +| `name` | string | | Name of the Application Group to create this application in. | + +**Optional parameters** + +| Parameter Name | Type | Default Value | Allowed Values | Description | +| :-- | :-- | :-- | :-- | :-- | +| `applications` | _[applications](applications/readme.md)_ array | `[]` | | List of applications to be created in the Application Group. | +| `description` | string | `''` | | The description of the Application Group to be created. | +| `diagnosticEventHubAuthorizationRuleId` | string | `''` | | Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | +| `diagnosticEventHubName` | string | `''` | | Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | +| `diagnosticLogCategoriesToEnable` | array | `[allLogs]` | `[allLogs, Checkpoint, Error, Management]` | The name of logs that will be streamed. "allLogs" includes all possible logs for the resource. | +| `diagnosticLogsRetentionInDays` | int | `365` | | Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | +| `diagnosticSettingsName` | string | `''` | | The name of the diagnostic setting, if deployed. If left empty, it defaults to "-diagnosticSettings". | +| `diagnosticStorageAccountId` | string | `''` | | Resource ID of the diagnostic storage account. | +| `diagnosticWorkspaceId` | string | `''` | | Resource ID of log analytics. | +| `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via a Globally Unique Identifier (GUID). | +| `friendlyName` | string | `''` | | The friendly name of the Application Group to be created. | +| `location` | string | `[resourceGroup().location]` | | Location for all resources. | +| `lock` | string | `''` | `['', CanNotDelete, ReadOnly]` | Specify the type of lock. | +| `roleAssignments` | array | `[]` | | Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalIds' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'. | +| `tags` | object | `{object}` | | Tags of the resource. | + + +### Parameter Usage: `roleAssignments` + +Create a role assignment for the given resource. If you want to assign a service principal / managed identity that is created in the same deployment, make sure to also specify the `'principalType'` parameter and set it to `'ServicePrincipal'`. This will ensure the role assignment waits for the principal's propagation in Azure. + +

+ +Parameter JSON format + +```json +"roleAssignments": { + "value": [ + { + "roleDefinitionIdOrName": "Reader", + "description": "Reader Role Assignment", + "principalIds": [ + "12345678-1234-1234-1234-123456789012", // object 1 + "78945612-1234-1234-1234-123456789012" // object 2 + ] + }, + { + "roleDefinitionIdOrName": "/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11", + "principalIds": [ + "12345678-1234-1234-1234-123456789012" // object 1 + ], + "principalType": "ServicePrincipal" + } + ] +} +``` + +
+ +
+ +Bicep format + +```bicep +roleAssignments: [ + { + roleDefinitionIdOrName: 'Reader' + description: 'Reader Role Assignment' + principalIds: [ + '12345678-1234-1234-1234-123456789012' // object 1 + '78945612-1234-1234-1234-123456789012' // object 2 + ] + } + { + roleDefinitionIdOrName: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' + principalIds: [ + '12345678-1234-1234-1234-123456789012' // object 1 + ] + principalType: 'ServicePrincipal' + } +] +``` + +
+

+ +### Parameter Usage: `tags` + +Tag names and tag values can be provided as needed. A tag can be left without a value. + +

+ +Parameter JSON format + +```json +"tags": { + "value": { + "Environment": "Non-Prod", + "Contact": "test.user@testcompany.com", + "PurchaseOrder": "1234", + "CostCenter": "7890", + "ServiceName": "DeploymentValidation", + "Role": "DeploymentValidation" + } +} +``` + +
+ +
+ +Bicep format + +```bicep +tags: { + Environment: 'Non-Prod' + Contact: 'test.user@testcompany.com' + PurchaseOrder: '1234' + CostCenter: '7890' + ServiceName: 'DeploymentValidation' + Role: 'DeploymentValidation' +} +``` + +
+

+ +## Outputs + +| Output Name | Type | Description | +| :-- | :-- | :-- | +| `location` | string | The location the resource was deployed into. | +| `name` | string | The name of the AVD application group. | +| `resourceGroupName` | string | The resource group the AVD application group was deployed into. | +| `resourceId` | string | The resource ID of the AVD application group. | + +## Cross-referenced modules + +_None_ + +## Deployment examples + +The following module usage examples are retrieved from the content of the files hosted in the module's `.test` folder. + >**Note**: The name of each example is based on the name of the file from which it is taken. + + >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order. + +

Example 1: Common

+ +
+ +via Bicep module + +```bicep +module applicationgroups './Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep' = { + name: '${uniqueString(deployment().name, location)}-test-dvagcom' + params: { + // Required parameters + applicationGroupType: 'RemoteApp' + hostpoolName: '' + name: '<>dvagcom001' + // Non-required parameters + 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' + diagnosticEventHubAuthorizationRuleId: '' + diagnosticEventHubName: '' + diagnosticLogsRetentionInDays: 7 + diagnosticStorageAccountId: '' + diagnosticWorkspaceId: '' + enableDefaultTelemetry: '' + friendlyName: 'Remote Applications 1' + location: '' + lock: 'CanNotDelete' + roleAssignments: [ + { + principalIds: [ + '' + ] + principalType: 'ServicePrincipal' + roleDefinitionIdOrName: 'Reader' + } + ] + tags: { + Environment: 'Non-Prod' + Role: 'DeploymentValidation' + } + } +} +``` + +
+

+ +

+ +via JSON Parameter file + +```json +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + // Required parameters + "applicationGroupType": { + "value": "RemoteApp" + }, + "hostpoolName": { + "value": "" + }, + "name": { + "value": "<>dvagcom001" + }, + // Non-required parameters + "applications": { + "value": [ + { + "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": { + "value": "This is my first Remote Applications bundle" + }, + "diagnosticEventHubAuthorizationRuleId": { + "value": "" + }, + "diagnosticEventHubName": { + "value": "" + }, + "diagnosticLogsRetentionInDays": { + "value": 7 + }, + "diagnosticStorageAccountId": { + "value": "" + }, + "diagnosticWorkspaceId": { + "value": "" + }, + "enableDefaultTelemetry": { + "value": "" + }, + "friendlyName": { + "value": "Remote Applications 1" + }, + "location": { + "value": "" + }, + "lock": { + "value": "CanNotDelete" + }, + "roleAssignments": { + "value": [ + { + "principalIds": [ + "" + ], + "principalType": "ServicePrincipal", + "roleDefinitionIdOrName": "Reader" + } + ] + }, + "tags": { + "value": { + "Environment": "Non-Prod", + "Role": "DeploymentValidation" + } + } + } +} +``` + +
+

+ +

Example 2: Min

+ +
+ +via Bicep module + +```bicep +module applicationgroups './Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep' = { + name: '${uniqueString(deployment().name, location)}-test-dvagmin' + params: { + // Required parameters + applicationGroupType: 'RemoteApp' + hostpoolName: '' + name: '<>dvagmin001' + // Non-required parameters + enableDefaultTelemetry: '' + } +} +``` + +
+

+ +

+ +via JSON Parameter file + +```json +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + // Required parameters + "applicationGroupType": { + "value": "RemoteApp" + }, + "hostpoolName": { + "value": "" + }, + "name": { + "value": "<>dvagmin001" + }, + // Non-required parameters + "enableDefaultTelemetry": { + "value": "" + } + } +} +``` + +
+

diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/version.json b/modules/Microsoft.DesktopVirtualization/applicationgroups/version.json new file mode 100644 index 0000000000..56f8d9ca40 --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/applicationgroups/version.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", + "version": "0.4" +} diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_roleAssignments.bicep new file mode 100644 index 0000000000..26992c24af --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_roleAssignments.bicep @@ -0,0 +1,82 @@ +@sys.description('Required. The IDs of the principals to assign the role to.') +param principalIds array + +@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.') +param roleDefinitionIdOrName string + +@sys.description('Required. The resource ID of the resource to apply the role assignment to.') +param resourceId string + +@sys.description('Optional. The principal type of the assigned principal ID.') +@allowed([ + 'ServicePrincipal' + 'Group' + 'User' + 'ForeignGroup' + 'Device' + '' +]) +param principalType string = '' + +@sys.description('Optional. The description of the role assignment.') +param description string = '' + +@sys.description('Optional. The conditions on the role assignment. This limits the resources it can be assigned to. e.g.: @Resource[Microsoft.Storage/storageAccounts/blobServices/containers:ContainerName] StringEqualsIgnoreCase "foo_storage_container".') +param condition string = '' + +@sys.description('Optional. Version of the condition.') +@allowed([ + '2.0' +]) +param conditionVersion string = '2.0' + +@sys.description('Optional. Id of the delegated managed identity resource.') +param delegatedManagedIdentityResourceId string = '' + +var builtInRoleNames = { + 'Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ca6382a4-1721-4bcf-a114-ff0c70227b6b') + Contributor: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c') + 'Desktop Virtualization Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '86240b0e-9422-4c43-887b-b61143f32ba8') + 'Desktop Virtualization Application Group Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'aebf23d0-b568-4e86-b8f9-fe83a2c6ab55') + 'Desktop Virtualization Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '082f0a83-3be5-4ba1-904c-961cca79b387') + 'Desktop Virtualization Host Pool Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e307426c-f9b6-4e81-87de-d99efb3c32bc') + 'Desktop Virtualization Host Pool Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ceadfde2-b300-400a-ab7b-6143895aa822') + 'Desktop Virtualization Power On Off Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '40c5ff49-9181-41f8-ae61-143b0e78555e') + 'Desktop Virtualization Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '49a72310-ab8d-41df-bbb0-79b649203868') + 'Desktop Virtualization Session Host Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2ad6aaab-ead9-4eaa-8ac5-da422f562408') + 'Desktop Virtualization User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '1d18fff3-a72a-46b5-b4a9-0b38a3cd7e63') + 'Desktop Virtualization User Session Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ea4bfff8-7fb4-485a-aadd-d4129a0ffaa6') + 'Desktop Virtualization Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a959dbd1-f747-45e3-8ba6-dd80f235f97c') + 'Desktop Virtualization Workspace Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21efdde3-836f-432b-bf3d-3e8e734d4b2b') + 'Desktop Virtualization Workspace Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0fa44ee9-7a7d-466b-9bb2-2bf446b1204d') + 'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293') + 'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893') + 'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e') + 'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae') + 'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44') + 'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa') + 'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05') + Owner: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635') + Reader: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7') + 'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608') + 'Role Based Access Control Administrator (Preview)': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f58310d9-a9f6-439a-9e8d-f62e7b41a168') + 'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9') +} + +resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2022-09-09' existing = { + name: last(split(resourceId, '/'))! +} + +resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = [for principalId in principalIds: { + name: guid(hostPool.id, principalId, roleDefinitionIdOrName) + properties: { + description: description + roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName + principalId: principalId + principalType: !empty(principalType) ? any(principalType) : null + condition: !empty(condition) ? condition : null + conditionVersion: !empty(conditionVersion) && !empty(condition) ? conditionVersion : null + delegatedManagedIdentityResourceId: !empty(delegatedManagedIdentityResourceId) ? delegatedManagedIdentityResourceId : null + } + scope: hostPool +}] diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/.test/common/dependencies.bicep b/modules/Microsoft.DesktopVirtualization/hostpools/.test/common/dependencies.bicep new file mode 100644 index 0000000000..7371d4437b --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/hostpools/.test/common/dependencies.bicep @@ -0,0 +1,14 @@ +@description('Optional. The location to deploy to.') +param location string = resourceGroup().location + +@description('Required. The name of the Managed Identity to create.') +param managedIdentityName string + +resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { + name: managedIdentityName + location: location +} + +@description('The principal ID of the created Managed Identity.') +output managedIdentityPrincipalId string = managedIdentity.properties.principalId + diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/.test/common/deploy.test.bicep b/modules/Microsoft.DesktopVirtualization/hostpools/.test/common/deploy.test.bicep new file mode 100644 index 0000000000..e2b7715a47 --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/hostpools/.test/common/deploy.test.bicep @@ -0,0 +1,123 @@ +targetScope = 'subscription' + +// ========== // +// 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 + +// ============ // +// 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-<>-msi-${serviceShort}' + } +} + +// Diagnostics +// =========== +module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' + params: { + storageAccountName: 'dep<>diasa${serviceShort}01' + logAnalyticsWorkspaceName: 'dep-<>-law-${serviceShort}' + eventHubNamespaceEventHubName: 'dep-<>-evh-${serviceShort}' + eventHubNamespaceName: 'dep-<>-evhns-${serviceShort}' + location: location + } +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + params: { + enableDefaultTelemetry: enableDefaultTelemetry + name: '<>${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;' + diagnosticLogsRetentionInDays: 7 + 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: 'CanNotDelete' + maxSessionLimit: 99999 + personalDesktopAssignmentType: 'Automatic' + roleAssignments: [ + { + roleDefinitionIdOrName: 'Reader' + principalIds: [ + 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: { + 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/Microsoft.DesktopVirtualization/hostpools/.test/min/deploy.test.bicep b/modules/Microsoft.DesktopVirtualization/hostpools/.test/min/deploy.test.bicep new file mode 100644 index 0000000000..4c9a96927a --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/hostpools/.test/min/deploy.test.bicep @@ -0,0 +1,42 @@ +targetScope = 'subscription' + +// ========== // +// 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 = 'dvhpmin' + +@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +param enableDefaultTelemetry bool = true + +// ============ // +// Dependencies // +// ============ // + +// General resources +// ================= +resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { + name: resourceGroupName + location: location +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + params: { + enableDefaultTelemetry: enableDefaultTelemetry + name: '<>${serviceShort}001' + } +} diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/deploy.bicep b/modules/Microsoft.DesktopVirtualization/hostpools/deploy.bicep new file mode 100644 index 0000000000..e55a4e2c5d --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/hostpools/deploy.bicep @@ -0,0 +1,257 @@ +@sys.description('Required. Name of the Host Pool.') +@minLength(1) +param name string + +@sys.description('Optional. Location for all resources.') +param location string = resourceGroup().location + +@sys.description('Optional. The friendly name of the Host Pool to be created.') +param friendlyName string = '' + +@sys.description('Optional. The description of the Host Pool to be created.') +param description string = '' + +@sys.description('Optional. Set this parameter to Personal if you would like to enable Persistent Desktop experience. Defaults to Pooled.') +@allowed([ + 'Personal' + 'Pooled' +]) +param type string = 'Pooled' + +@sys.description('Optional. Set the type of assignment for a Personal Host Pool type.') +@allowed([ + 'Automatic' + 'Direct' + '' +]) +param personalDesktopAssignmentType string = '' + +@sys.description('Optional. Type of load balancer algorithm.') +@allowed([ + 'BreadthFirst' + 'DepthFirst' + 'Persistent' +]) +param loadBalancerType string = 'BreadthFirst' + +@sys.description('Optional. Maximum number of sessions.') +param maxSessionLimit int = 99999 + +@sys.description('Optional. Host Pool RDP properties.') +param customRdpProperty string = '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;' + +@sys.description('Optional. Validation host pools allows you to test service changes before they are deployed to production. When set to true, the Host Pool will be deployed in a validation \'ring\' (environment) that receives all the new features (might be less stable). Defaults to false that stands for the stable, production-ready environment.') +param validationEnvironment bool = false + +@sys.description('Optional. The necessary information for adding more VMs to this Host Pool.') +param vmTemplate object = {} + +@sys.description('Optional. Host Pool token validity length. Usage: \'PT8H\' - valid for 8 hours; \'P5D\' - valid for 5 days; \'P1Y\' - valid for 1 year. When not provided, the token will be valid for 8 hours.') +param tokenValidityLength string = 'PT8H' + +@sys.description('Generated. Do not provide a value! This date value is used to generate a registration token.') +param baseTime string = utcNow('u') + +@sys.description('Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely.') +@minValue(0) +@maxValue(365) +param diagnosticLogsRetentionInDays int = 365 + +@sys.description('Optional. Resource ID of the diagnostic storage account.') +param diagnosticStorageAccountId string = '' + +@sys.description('Optional. Resource ID of the diagnostic log analytics workspace.') +param diagnosticWorkspaceId string = '' + +@sys.description('Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to.') +param diagnosticEventHubAuthorizationRuleId string = '' + +@sys.description('Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category.') +param diagnosticEventHubName string = '' + +@allowed([ + '' + 'CanNotDelete' + 'ReadOnly' +]) +@sys.description('Optional. Specify the type of lock.') +param lock string = '' + +@sys.description('Optional. Tags of the resource.') +param tags object = {} + +@sys.description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +param enableDefaultTelemetry bool = true + +@sys.description('Optional. The type of preferred application group type, default to Desktop Application Group.') +@allowed([ + 'Desktop' + 'None' + 'RailApplications' +]) +param preferredAppGroupType string = 'Desktop' + +@sys.description('Optional. Enable Start VM on connect to allow users to start the virtual machine from a deallocated state. Important: Custom RBAC role required to power manage VMs.') +param startVMOnConnect bool = false + +@sys.description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalIds\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'.') +param roleAssignments array = [] + +@sys.description('Optional. The session host configuration for updating agent, monitoring agent, and stack component.') +param agentUpdate object = { + useSessionHostLocalTime: true +} + +@sys.description('Optional. The ring number of HostPool.') +param ring int = -1 + +@sys.description('Optional. URL to customer ADFS server for signing WVD SSO certificates.') +param ssoadfsAuthority string = '' + +@sys.description('Optional. ClientId for the registered Relying Party used to issue WVD SSO certificates.') +param ssoClientId string = '' + +@sys.description('Optional. Path to Azure KeyVault storing the secret used for communication to ADFS.') +#disable-next-line secure-secrets-in-params +param ssoClientSecretKeyVaultPath string = '' + +@sys.description('Optional. The type of single sign on Secret Type.') +@allowed([ + '' + 'Certificate' + 'CertificateInKeyVault' + 'SharedKey' + 'SharedKeyInKeyVault' +]) +#disable-next-line secure-secrets-in-params +param ssoSecretType string = '' + +@sys.description('Optional. The name of logs that will be streamed. "allLogs" includes all possible logs for the resource.') +@allowed([ + 'allLogs' + 'Checkpoint' + 'Error' + 'Management' + 'Connection' + 'HostRegistration' + 'AgentHealthStatus' +]) +param diagnosticLogCategoriesToEnable array = [ + 'allLogs' +] + +@sys.description('Optional. The name of the diagnostic setting, if deployed. If left empty, it defaults to "-diagnosticSettings".') +param diagnosticSettingsName string = '' + +var diagnosticsLogsSpecified = [for category in filter(diagnosticLogCategoriesToEnable, item => item != 'allLogs'): { + category: category + enabled: true + retentionPolicy: { + enabled: true + days: diagnosticLogsRetentionInDays + } +}] + +var diagnosticsLogs = contains(diagnosticLogCategoriesToEnable, 'allLogs') ? [ + { + categoryGroup: 'allLogs' + enabled: true + retentionPolicy: { + enabled: true + days: diagnosticLogsRetentionInDays + } + } +] : diagnosticsLogsSpecified + +var tokenExpirationTime = dateTimeAdd(baseTime, tokenValidityLength) + +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name, location)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } +} + +resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2022-09-09' = { + name: name + location: location + tags: tags + properties: { + friendlyName: friendlyName + description: description + hostPoolType: type + customRdpProperty: customRdpProperty + personalDesktopAssignmentType: any(personalDesktopAssignmentType) + preferredAppGroupType: preferredAppGroupType + maxSessionLimit: maxSessionLimit + loadBalancerType: loadBalancerType + startVMOnConnect: startVMOnConnect + validationEnvironment: validationEnvironment + registrationInfo: { + expirationTime: tokenExpirationTime + token: null + registrationTokenOperation: 'Update' + } + vmTemplate: ((!empty(vmTemplate)) ? null : string(vmTemplate)) + agentUpdate: agentUpdate + ring: ring != -1 ? ring : null + ssoadfsAuthority: ssoadfsAuthority + ssoClientId: ssoClientId + ssoClientSecretKeyVaultPath: ssoClientSecretKeyVaultPath + ssoSecretType: !empty(ssoSecretType) ? ssoSecretType : null + } +} + +resource hostPool_lock 'Microsoft.Authorization/locks@2020-05-01' = if (!empty(lock)) { + name: '${hostPool.name}-${lock}-lock' + properties: { + level: any(lock) + notes: lock == 'CanNotDelete' ? 'Cannot delete resource or child resources.' : 'Cannot modify the resource or child resources.' + } + scope: hostPool +} + +resource hostPool_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@2021-05-01-preview' = if ((!empty(diagnosticStorageAccountId)) || (!empty(diagnosticWorkspaceId)) || (!empty(diagnosticEventHubAuthorizationRuleId)) || (!empty(diagnosticEventHubName))) { + name: !empty(diagnosticSettingsName) ? diagnosticSettingsName : '${name}-diagnosticSettings' + properties: { + storageAccountId: !empty(diagnosticStorageAccountId) ? diagnosticStorageAccountId : null + workspaceId: !empty(diagnosticWorkspaceId) ? diagnosticWorkspaceId : null + eventHubAuthorizationRuleId: !empty(diagnosticEventHubAuthorizationRuleId) ? diagnosticEventHubAuthorizationRuleId : null + eventHubName: !empty(diagnosticEventHubName) ? diagnosticEventHubName : null + logs: diagnosticsLogs + } + scope: hostPool +} + +module hostPool_roleAssignments '.bicep/nested_roleAssignments.bicep' = [for (roleAssignment, index) in roleAssignments: { + name: '${uniqueString(deployment().name, location)}-HostPool-Rbac-${index}' + params: { + description: contains(roleAssignment, 'description') ? roleAssignment.description : '' + principalIds: roleAssignment.principalIds + principalType: contains(roleAssignment, 'principalType') ? roleAssignment.principalType : '' + roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName + condition: contains(roleAssignment, 'condition') ? roleAssignment.condition : '' + delegatedManagedIdentityResourceId: contains(roleAssignment, 'delegatedManagedIdentityResourceId') ? roleAssignment.delegatedManagedIdentityResourceId : '' + resourceId: hostPool.id + } +}] + +@sys.description('The resource ID of the AVD host pool.') +output resourceId string = hostPool.id + +@sys.description('The resource group the AVD host pool was deployed into.') +output resourceGroupName string = resourceGroup().name + +@sys.description('The name of the AVD host pool.') +output name string = hostPool.name + +@sys.description('The expiration time for the registration token.') +output tokenExpirationTime string = dateTimeAdd(baseTime, tokenValidityLength) + +@sys.description('The location the resource was deployed into.') +output location string = hostPool.location diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/readme.md b/modules/Microsoft.DesktopVirtualization/hostpools/readme.md new file mode 100644 index 0000000000..71a755bebe --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/hostpools/readme.md @@ -0,0 +1,519 @@ +# AVD Host Pools `[Microsoft.DesktopVirtualization/hostpools]` + +This module deploys an Azure virtual desktop host pool. + +## Navigation + +- [Resource types](#Resource-types) +- [Parameters](#Parameters) +- [Outputs](#Outputs) +- [Cross-referenced modules](#Cross-referenced-modules) +- [Deployment examples](#Deployment-examples) + +## Resource types + +| Resource Type | API Version | +| :-- | :-- | +| `Microsoft.Authorization/locks` | [2020-05-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2020-05-01/locks) | +| `Microsoft.Authorization/roleAssignments` | [2022-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments) | +| `Microsoft.DesktopVirtualization/hostPools` | [2022-09-09](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2022-09-09/hostPools) | +| `Microsoft.Insights/diagnosticSettings` | [2021-05-01-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) | + +## Parameters + +**Required parameters** + +| Parameter Name | Type | Description | +| :-- | :-- | :-- | +| `name` | string | Name of the Host Pool. | + +**Optional parameters** + +| Parameter Name | Type | Default Value | Allowed Values | Description | +| :-- | :-- | :-- | :-- | :-- | +| `agentUpdate` | object | `{object}` | | The session host configuration for updating agent, monitoring agent, and stack component. | +| `customRdpProperty` | string | `'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;'` | | Host Pool RDP properties. | +| `description` | string | `''` | | The description of the Host Pool to be created. | +| `diagnosticEventHubAuthorizationRuleId` | string | `''` | | Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | +| `diagnosticEventHubName` | string | `''` | | Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | +| `diagnosticLogCategoriesToEnable` | array | `[allLogs]` | `[AgentHealthStatus, allLogs, Checkpoint, Connection, Error, HostRegistration, Management]` | The name of logs that will be streamed. "allLogs" includes all possible logs for the resource. | +| `diagnosticLogsRetentionInDays` | int | `365` | | Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | +| `diagnosticSettingsName` | string | `''` | | The name of the diagnostic setting, if deployed. If left empty, it defaults to "-diagnosticSettings". | +| `diagnosticStorageAccountId` | string | `''` | | Resource ID of the diagnostic storage account. | +| `diagnosticWorkspaceId` | string | `''` | | Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via a Globally Unique Identifier (GUID). | +| `friendlyName` | string | `''` | | The friendly name of the Host Pool to be created. | +| `loadBalancerType` | string | `'BreadthFirst'` | `[BreadthFirst, DepthFirst, Persistent]` | Type of load balancer algorithm. | +| `location` | string | `[resourceGroup().location]` | | Location for all resources. | +| `lock` | string | `''` | `['', CanNotDelete, ReadOnly]` | Specify the type of lock. | +| `maxSessionLimit` | int | `99999` | | Maximum number of sessions. | +| `personalDesktopAssignmentType` | string | `''` | `['', Automatic, Direct]` | Set the type of assignment for a Personal Host Pool type. | +| `preferredAppGroupType` | string | `'Desktop'` | `[Desktop, None, RailApplications]` | The type of preferred application group type, default to Desktop Application Group. | +| `ring` | int | `-1` | | The ring number of HostPool. | +| `roleAssignments` | array | `[]` | | Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalIds' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'. | +| `ssoadfsAuthority` | string | `''` | | URL to customer ADFS server for signing WVD SSO certificates. | +| `ssoClientId` | string | `''` | | ClientId for the registered Relying Party used to issue WVD SSO certificates. | +| `ssoClientSecretKeyVaultPath` | string | `''` | | Path to Azure KeyVault storing the secret used for communication to ADFS. | +| `ssoSecretType` | string | `''` | `['', Certificate, CertificateInKeyVault, SharedKey, SharedKeyInKeyVault]` | The type of single sign on Secret Type. | +| `startVMOnConnect` | bool | `False` | | Enable Start VM on connect to allow users to start the virtual machine from a deallocated state. Important: Custom RBAC role required to power manage VMs. | +| `tags` | object | `{object}` | | Tags of the resource. | +| `tokenValidityLength` | string | `'PT8H'` | | Host Pool token validity length. Usage: 'PT8H' - valid for 8 hours; 'P5D' - valid for 5 days; 'P1Y' - valid for 1 year. When not provided, the token will be valid for 8 hours. | +| `type` | string | `'Pooled'` | `[Personal, Pooled]` | Set this parameter to Personal if you would like to enable Persistent Desktop experience. Defaults to Pooled. | +| `validationEnvironment` | bool | `False` | | Validation host pools allows you to test service changes before they are deployed to production. When set to true, the Host Pool will be deployed in a validation 'ring' (environment) that receives all the new features (might be less stable). Defaults to false that stands for the stable, production-ready environment. | +| `vmTemplate` | object | `{object}` | | The necessary information for adding more VMs to this Host Pool. | + +**Generated parameters** + +| Parameter Name | Type | Default Value | Description | +| :-- | :-- | :-- | :-- | +| `baseTime` | string | `[utcNow('u')]` | Do not provide a value! This date value is used to generate a registration token. | + + +### Parameter Usage: `roleAssignments` + +Create a role assignment for the given resource. If you want to assign a service principal / managed identity that is created in the same deployment, make sure to also specify the `'principalType'` parameter and set it to `'ServicePrincipal'`. This will ensure the role assignment waits for the principal's propagation in Azure. + +

+ +Parameter JSON format + +```json +"roleAssignments": { + "value": [ + { + "roleDefinitionIdOrName": "Reader", + "description": "Reader Role Assignment", + "principalIds": [ + "12345678-1234-1234-1234-123456789012", // object 1 + "78945612-1234-1234-1234-123456789012" // object 2 + ] + }, + { + "roleDefinitionIdOrName": "/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11", + "principalIds": [ + "12345678-1234-1234-1234-123456789012" // object 1 + ], + "principalType": "ServicePrincipal" + } + ] +} +``` + +
+ +
+ +Bicep format + +```bicep +roleAssignments: [ + { + roleDefinitionIdOrName: 'Reader' + description: 'Reader Role Assignment' + principalIds: [ + '12345678-1234-1234-1234-123456789012' // object 1 + '78945612-1234-1234-1234-123456789012' // object 2 + ] + } + { + roleDefinitionIdOrName: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' + principalIds: [ + '12345678-1234-1234-1234-123456789012' // object 1 + ] + principalType: 'ServicePrincipal' + } +] +``` + +
+

+ +### Parameter Usage: `vmTemplate` + +The below parameter object is converted to an in-line string when handed over to the resource deployment, since that only takes strings. + +

+ +Parameter JSON format + +```json +"vmTemplate": { + "value": { + "domain": ".com", + "galleryImageOffer": "office-365", + "galleryImagePublisher": "microsoftwindowsdesktop", + "galleryImageSKU": "19h2-evd-o365pp", + "imageType": "Gallery", + "imageUri": null, + "customImageId": null, + "namePrefix": "AVDv2", + "osDiskType": "StandardSSD_LRS", + "useManagedDisks": true, + "vmSize": { + "id": "Standard_D2s_v3", + "cores": 2, + "ram": 8 + } + } +} +``` + +
+ +
+ +Bicep format + +```bicep +vmTemplate: { + domain: '.com' + galleryImageOffer: 'office-365' + galleryImagePublisher: 'microsoftwindowsdesktop' + galleryImageSKU: '19h2-evd-o365pp' + imageType: 'Gallery' + imageUri: null + customImageId: null + namePrefix: 'AVDv2' + osDiskType: 'StandardSSD_LRS' + useManagedDisks: true + vmSize: { + id: 'Standard_D2s_v3' + cores: 2 + ram: 8 + } +} +``` + +
+

+ +### Parameter Usage: `customRdpProperty` + +

+ +Parameter JSON format + +```json +"customRdpProperty": { + "value": "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;" +} +``` + +
+ +
+ +Bicep format + +```bicep +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;' +``` + +
+

+ +### Parameter Usage: `tags` + +Tag names and tag values can be provided as needed. A tag can be left without a value. + +

+ +Parameter JSON format + +```json +"tags": { + "value": { + "Environment": "Non-Prod", + "Contact": "test.user@testcompany.com", + "PurchaseOrder": "1234", + "CostCenter": "7890", + "ServiceName": "DeploymentValidation", + "Role": "DeploymentValidation" + } +} +``` + +
+ +
+ +Bicep format + +```bicep +tags: { + Environment: 'Non-Prod' + Contact: 'test.user@testcompany.com' + PurchaseOrder: '1234' + CostCenter: '7890' + ServiceName: 'DeploymentValidation' + Role: 'DeploymentValidation' +} +``` + +
+

+ +## Outputs + +| Output Name | Type | Description | +| :-- | :-- | :-- | +| `location` | string | The location the resource was deployed into. | +| `name` | string | The name of the AVD host pool. | +| `resourceGroupName` | string | The resource group the AVD host pool was deployed into. | +| `resourceId` | string | The resource ID of the AVD host pool. | +| `tokenExpirationTime` | string | The expiration time for the registration token. | + +## Cross-referenced modules + +_None_ + +## Deployment examples + +The following module usage examples are retrieved from the content of the files hosted in the module's `.test` folder. + >**Note**: The name of each example is based on the name of the file from which it is taken. + + >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order. + +

Example 1: Common

+ +
+ +via Bicep module + +```bicep +module hostpools './Microsoft.DesktopVirtualization/hostpools/deploy.bicep' = { + name: '${uniqueString(deployment().name, location)}-test-dvhpcom' + params: { + // Required parameters + name: '<>dvhpcom001' + // Non-required parameters + agentUpdate: { + maintenanceWindows: [ + { + dayOfWeek: 'Friday' + hour: 7 + } + { + dayOfWeek: 'Saturday' + hour: 8 + } + ] + maintenanceWindowTimeZone: 'Alaskan Standard Time' + type: 'Scheduled' + useSessionHostLocalTime: false + } + 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;' + description: 'My first AVD Host Pool' + diagnosticEventHubAuthorizationRuleId: '' + diagnosticEventHubName: '' + diagnosticLogsRetentionInDays: 7 + diagnosticStorageAccountId: '' + diagnosticWorkspaceId: '' + enableDefaultTelemetry: '' + friendlyName: 'AVDv2' + loadBalancerType: 'BreadthFirst' + location: '' + lock: 'CanNotDelete' + maxSessionLimit: 99999 + personalDesktopAssignmentType: 'Automatic' + roleAssignments: [ + { + principalIds: [ + '' + ] + principalType: 'ServicePrincipal' + roleDefinitionIdOrName: 'Reader' + } + ] + tags: { + Environment: 'Non-Prod' + Role: 'DeploymentValidation' + } + type: 'Pooled' + vmTemplate: { + customImageId: '' + domain: 'domainname.onmicrosoft.com' + galleryImageOffer: 'office-365' + galleryImagePublisher: 'microsoftwindowsdesktop' + galleryImageSKU: '20h1-evd-o365pp' + imageType: 'Gallery' + imageUri: '' + namePrefix: 'avdv2' + osDiskType: 'StandardSSD_LRS' + useManagedDisks: true + vmSize: { + cores: 2 + id: 'Standard_D2s_v3' + ram: 8 + } + } + } +} +``` + +
+

+ +

+ +via JSON Parameter file + +```json +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + // Required parameters + "name": { + "value": "<>dvhpcom001" + }, + // Non-required parameters + "agentUpdate": { + "value": { + "maintenanceWindows": [ + { + "dayOfWeek": "Friday", + "hour": 7 + }, + { + "dayOfWeek": "Saturday", + "hour": 8 + } + ], + "maintenanceWindowTimeZone": "Alaskan Standard Time", + "type": "Scheduled", + "useSessionHostLocalTime": false + } + }, + "customRdpProperty": { + "value": "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;" + }, + "description": { + "value": "My first AVD Host Pool" + }, + "diagnosticEventHubAuthorizationRuleId": { + "value": "" + }, + "diagnosticEventHubName": { + "value": "" + }, + "diagnosticLogsRetentionInDays": { + "value": 7 + }, + "diagnosticStorageAccountId": { + "value": "" + }, + "diagnosticWorkspaceId": { + "value": "" + }, + "enableDefaultTelemetry": { + "value": "" + }, + "friendlyName": { + "value": "AVDv2" + }, + "loadBalancerType": { + "value": "BreadthFirst" + }, + "location": { + "value": "" + }, + "lock": { + "value": "CanNotDelete" + }, + "maxSessionLimit": { + "value": 99999 + }, + "personalDesktopAssignmentType": { + "value": "Automatic" + }, + "roleAssignments": { + "value": [ + { + "principalIds": [ + "" + ], + "principalType": "ServicePrincipal", + "roleDefinitionIdOrName": "Reader" + } + ] + }, + "tags": { + "value": { + "Environment": "Non-Prod", + "Role": "DeploymentValidation" + } + }, + "type": { + "value": "Pooled" + }, + "vmTemplate": { + "value": { + "customImageId": "", + "domain": "domainname.onmicrosoft.com", + "galleryImageOffer": "office-365", + "galleryImagePublisher": "microsoftwindowsdesktop", + "galleryImageSKU": "20h1-evd-o365pp", + "imageType": "Gallery", + "imageUri": "", + "namePrefix": "avdv2", + "osDiskType": "StandardSSD_LRS", + "useManagedDisks": true, + "vmSize": { + "cores": 2, + "id": "Standard_D2s_v3", + "ram": 8 + } + } + } + } +} +``` + +
+

+ +

Example 2: Min

+ +
+ +via Bicep module + +```bicep +module hostpools './Microsoft.DesktopVirtualization/hostpools/deploy.bicep' = { + name: '${uniqueString(deployment().name, location)}-test-dvhpmin' + params: { + // Required parameters + name: '<>dvhpmin001' + // Non-required parameters + enableDefaultTelemetry: '' + } +} +``` + +
+

+ +

+ +via JSON Parameter file + +```json +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + // Required parameters + "name": { + "value": "<>dvhpmin001" + }, + // Non-required parameters + "enableDefaultTelemetry": { + "value": "" + } + } +} +``` + +
+

diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/version.json b/modules/Microsoft.DesktopVirtualization/hostpools/version.json new file mode 100644 index 0000000000..56f8d9ca40 --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/hostpools/version.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", + "version": "0.4" +} diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_roleAssignments.bicep new file mode 100644 index 0000000000..517b6b8cdc --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_roleAssignments.bicep @@ -0,0 +1,82 @@ +@sys.description('Required. The IDs of the principals to assign the role to.') +param principalIds array + +@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.') +param roleDefinitionIdOrName string + +@sys.description('Required. The resource ID of the resource to apply the role assignment to.') +param resourceId string + +@sys.description('Optional. The principal type of the assigned principal ID.') +@allowed([ + 'ServicePrincipal' + 'Group' + 'User' + 'ForeignGroup' + 'Device' + '' +]) +param principalType string = '' + +@sys.description('Optional. The description of the role assignment.') +param description string = '' + +@sys.description('Optional. The conditions on the role assignment. This limits the resources it can be assigned to. e.g.: @Resource[Microsoft.Storage/storageAccounts/blobServices/containers:ContainerName] StringEqualsIgnoreCase "foo_storage_container".') +param condition string = '' + +@sys.description('Optional. Version of the condition.') +@allowed([ + '2.0' +]) +param conditionVersion string = '2.0' + +@sys.description('Optional. Id of the delegated managed identity resource.') +param delegatedManagedIdentityResourceId string = '' + +var builtInRoleNames = { + 'Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ca6382a4-1721-4bcf-a114-ff0c70227b6b') + Contributor: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c') + 'Desktop Virtualization Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '86240b0e-9422-4c43-887b-b61143f32ba8') + 'Desktop Virtualization Application Group Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'aebf23d0-b568-4e86-b8f9-fe83a2c6ab55') + 'Desktop Virtualization Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '082f0a83-3be5-4ba1-904c-961cca79b387') + 'Desktop Virtualization Host Pool Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e307426c-f9b6-4e81-87de-d99efb3c32bc') + 'Desktop Virtualization Host Pool Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ceadfde2-b300-400a-ab7b-6143895aa822') + 'Desktop Virtualization Power On Off Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '40c5ff49-9181-41f8-ae61-143b0e78555e') + 'Desktop Virtualization Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '49a72310-ab8d-41df-bbb0-79b649203868') + 'Desktop Virtualization Session Host Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2ad6aaab-ead9-4eaa-8ac5-da422f562408') + 'Desktop Virtualization User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '1d18fff3-a72a-46b5-b4a9-0b38a3cd7e63') + 'Desktop Virtualization User Session Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ea4bfff8-7fb4-485a-aadd-d4129a0ffaa6') + 'Desktop Virtualization Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a959dbd1-f747-45e3-8ba6-dd80f235f97c') + 'Desktop Virtualization Workspace Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21efdde3-836f-432b-bf3d-3e8e734d4b2b') + 'Desktop Virtualization Workspace Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0fa44ee9-7a7d-466b-9bb2-2bf446b1204d') + 'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293') + 'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893') + 'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e') + 'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae') + 'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44') + 'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa') + 'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05') + Owner: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635') + Reader: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7') + 'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608') + 'Role Based Access Control Administrator (Preview)': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f58310d9-a9f6-439a-9e8d-f62e7b41a168') + 'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9') +} + +resource scalingPlan 'Microsoft.DesktopVirtualization/scalingPlans@2022-09-09' existing = { + name: last(split(resourceId, '/'))! +} + +resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = [for principalId in principalIds: { + name: guid(scalingPlan.id, principalId, roleDefinitionIdOrName) + properties: { + description: description + roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName + principalId: principalId + principalType: !empty(principalType) ? any(principalType) : null + condition: !empty(condition) ? condition : null + conditionVersion: !empty(conditionVersion) && !empty(condition) ? conditionVersion : null + delegatedManagedIdentityResourceId: !empty(delegatedManagedIdentityResourceId) ? delegatedManagedIdentityResourceId : null + } + scope: scalingPlan +}] diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/.test/common/dependencies.bicep b/modules/Microsoft.DesktopVirtualization/scalingplans/.test/common/dependencies.bicep new file mode 100644 index 0000000000..7371d4437b --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/scalingplans/.test/common/dependencies.bicep @@ -0,0 +1,14 @@ +@description('Optional. The location to deploy to.') +param location string = resourceGroup().location + +@description('Required. The name of the Managed Identity to create.') +param managedIdentityName string + +resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { + name: managedIdentityName + location: location +} + +@description('The principal ID of the created Managed Identity.') +output managedIdentityPrincipalId string = managedIdentity.properties.principalId + diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/.test/common/deploy.test.bicep b/modules/Microsoft.DesktopVirtualization/scalingplans/.test/common/deploy.test.bicep new file mode 100644 index 0000000000..dbc7e02f62 --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/scalingplans/.test/common/deploy.test.bicep @@ -0,0 +1,85 @@ +targetScope = 'subscription' + +// ========== // +// 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 + +// ============ // +// 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-<>-msi-${serviceShort}' + } +} + +// Diagnostics +// =========== +module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' + params: { + storageAccountName: 'dep<>diasa${serviceShort}01' + logAnalyticsWorkspaceName: 'dep-<>-law-${serviceShort}' + eventHubNamespaceEventHubName: 'dep-<>-evh-${serviceShort}' + eventHubNamespaceName: 'dep-<>-evhns-${serviceShort}' + location: location + } +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + params: { + enableDefaultTelemetry: enableDefaultTelemetry + name: '<>${serviceShort}001' + roleAssignments: [ + { + roleDefinitionIdOrName: 'Reader' + principalIds: [ + nestedDependencies.outputs.managedIdentityPrincipalId + ] + principalType: 'ServicePrincipal' + } + ] + diagnosticLogsRetentionInDays: 7 + diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId + diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId + diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId + diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName + tags: { + Environment: 'Non-Prod' + Role: 'DeploymentValidation' + } + hostPoolType: 'Pooled' + friendlyName: 'My Scaling Plan' + description: 'My Scaling Plan Description' + } +} diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/.test/min/deploy.test.bicep b/modules/Microsoft.DesktopVirtualization/scalingplans/.test/min/deploy.test.bicep new file mode 100644 index 0000000000..9ca3365a0a --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/scalingplans/.test/min/deploy.test.bicep @@ -0,0 +1,42 @@ +targetScope = 'subscription' + +// ========== // +// 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 = 'dvspmin' + +@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +param enableDefaultTelemetry bool = true + +// ============ // +// Dependencies // +// ============ // + +// General resources +// ================= +resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { + name: resourceGroupName + location: location +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + params: { + enableDefaultTelemetry: enableDefaultTelemetry + name: '<>${serviceShort}001' + } +} diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/deploy.bicep b/modules/Microsoft.DesktopVirtualization/scalingplans/deploy.bicep new file mode 100644 index 0000000000..f8ea70b1eb --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/scalingplans/deploy.bicep @@ -0,0 +1,188 @@ +@sys.description('Required. Name of the scaling plan.') +@minLength(1) +param name string + +@sys.description('Optional. Location for all resources.') +param location string = resourceGroup().location + +@sys.description('Optional. Friendly Name of the scaling plan.') +param friendlyName string = name + +@sys.description('Optional. Description of the scaling plan.') +param description string = name + +@sys.description('Optional. Timezone to be used for the scaling plan.') +param timeZone string = 'W. Europe Standard Time' + +@allowed([ + 'Pooled' +]) +@sys.description('Optional. The type of hostpool where this scaling plan should be applied.') +param hostPoolType string = 'Pooled' + +@sys.description('Optional. Provide a tag to be used for hosts that should not be affected by the scaling plan.') +param exclusionTag string = '' + +@sys.description('Optional. The schedules related to this scaling plan. If no value is provided a default schedule will be provided.') +param schedules array = [ + { + 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' + } +] + +@sys.description('Optional. An array of references to hostpools.') +param hostPoolReferences array = [] + +@sys.description('Optional. Tags of the resource.') +param tags object = {} + +@sys.description('Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely.') +@minValue(0) +@maxValue(365) +param diagnosticLogsRetentionInDays int = 365 + +@sys.description('Optional. Resource ID of the diagnostic storage account.') +param diagnosticStorageAccountId string = '' + +@sys.description('Optional. Resource ID of the diagnostic log analytics workspace.') +param diagnosticWorkspaceId string = '' + +@sys.description('Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to.') +param diagnosticEventHubAuthorizationRuleId string = '' + +@sys.description('Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category.') +param diagnosticEventHubName string = '' + +@sys.description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalIds\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'.') +param roleAssignments array = [] + +@sys.description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +param enableDefaultTelemetry bool = true + +@sys.description('Optional. The name of logs that will be streamed. "allLogs" includes all possible logs for the resource.') +@allowed([ + 'allLogs' + 'Autoscale' +]) +param diagnosticLogCategoriesToEnable array = [ + 'allLogs' +] + +var diagnosticsLogsSpecified = [for category in filter(diagnosticLogCategoriesToEnable, item => item != 'allLogs'): { + category: category + enabled: true + retentionPolicy: { + enabled: true + days: diagnosticLogsRetentionInDays + } +}] + +var diagnosticsLogs = contains(diagnosticLogCategoriesToEnable, 'allLogs') ? [ + { + categoryGroup: 'allLogs' + enabled: true + retentionPolicy: { + enabled: true + days: diagnosticLogsRetentionInDays + } + } +] : diagnosticsLogsSpecified + +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name, location)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } +} + +resource scalingPlan 'Microsoft.DesktopVirtualization/scalingPlans@2022-09-09' = { + name: name + location: location + tags: tags + properties: { + friendlyName: friendlyName + timeZone: timeZone + hostPoolType: hostPoolType + exclusionTag: exclusionTag + schedules: schedules + hostPoolReferences: hostPoolReferences + description: description + } +} + +resource scalingplan_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@2021-05-01-preview' = if ((!empty(diagnosticStorageAccountId)) || (!empty(diagnosticWorkspaceId)) || (!empty(diagnosticEventHubAuthorizationRuleId)) || (!empty(diagnosticEventHubName))) { + name: '${scalingPlan.name}-diagnosticsetting' + properties: { + storageAccountId: !empty(diagnosticStorageAccountId) ? diagnosticStorageAccountId : null + workspaceId: !empty(diagnosticWorkspaceId) ? diagnosticWorkspaceId : null + eventHubAuthorizationRuleId: !empty(diagnosticEventHubAuthorizationRuleId) ? diagnosticEventHubAuthorizationRuleId : null + eventHubName: !empty(diagnosticEventHubName) ? diagnosticEventHubName : null + logs: diagnosticsLogs + } + scope: scalingPlan +} + +module scalingplan_roleAssignments '.bicep/nested_roleAssignments.bicep' = [for (roleAssignment, index) in roleAssignments: { + name: '${uniqueString(deployment().name, location)}-Workspace-Rbac-${index}' + params: { + description: contains(roleAssignment, 'description') ? roleAssignment.description : '' + principalIds: roleAssignment.principalIds + principalType: contains(roleAssignment, 'principalType') ? roleAssignment.principalType : '' + roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName + condition: contains(roleAssignment, 'condition') ? roleAssignment.condition : '' + delegatedManagedIdentityResourceId: contains(roleAssignment, 'delegatedManagedIdentityResourceId') ? roleAssignment.delegatedManagedIdentityResourceId : '' + resourceId: scalingPlan.id + } +}] + +@sys.description('The resource ID of the AVD scaling plan.') +output resourceId string = scalingPlan.id + +@sys.description('The resource group the AVD scaling plan was deployed into.') +output resourceGroupName string = resourceGroup().name + +@sys.description('The name of the AVD scaling plan.') +output name string = scalingPlan.name + +@sys.description('The location the resource was deployed into.') +output location string = scalingPlan.location diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/readme.md b/modules/Microsoft.DesktopVirtualization/scalingplans/readme.md new file mode 100644 index 0000000000..653d0a165b --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/scalingplans/readme.md @@ -0,0 +1,423 @@ +# AVD Scaling Plans `[Microsoft.DesktopVirtualization/scalingPlans]` + +This module deploys an AVD Scaling Plan. + +## Navigation + +- [Resource Types](#Resource-Types) +- [Parameters](#Parameters) +- [Outputs](#Outputs) +- [Cross-referenced modules](#Cross-referenced-modules) +- [Deployment examples](#Deployment-examples) + +## Resource Types + +| Resource Type | API Version | +| :-- | :-- | +| `Microsoft.Authorization/roleAssignments` | [2022-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments) | +| `Microsoft.DesktopVirtualization/scalingPlans` | [2022-09-09](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2022-09-09/scalingPlans) | +| `Microsoft.Insights/diagnosticSettings` | [2021-05-01-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) | + +## Parameters + +**Required parameters** + +| Parameter Name | Type | Description | +| :-- | :-- | :-- | +| `name` | string | Name of the scaling plan. | + +**Optional parameters** + +| Parameter Name | Type | Default Value | Allowed Values | Description | +| :-- | :-- | :-- | :-- | :-- | +| `description` | string | `[parameters('name')]` | | Description of the scaling plan. | +| `diagnosticEventHubAuthorizationRuleId` | string | `''` | | Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | +| `diagnosticEventHubName` | string | `''` | | Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | +| `diagnosticLogCategoriesToEnable` | array | `[allLogs]` | `[allLogs, Autoscale]` | The name of logs that will be streamed. "allLogs" includes all possible logs for the resource. | +| `diagnosticLogsRetentionInDays` | int | `365` | | Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | +| `diagnosticStorageAccountId` | string | `''` | | Resource ID of the diagnostic storage account. | +| `diagnosticWorkspaceId` | string | `''` | | Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via a Globally Unique Identifier (GUID). | +| `exclusionTag` | string | `''` | | Provide a tag to be used for hosts that should not be affected by the scaling plan. | +| `friendlyName` | string | `[parameters('name')]` | | Friendly Name of the scaling plan. | +| `hostPoolReferences` | array | `[]` | | An array of references to hostpools. | +| `hostPoolType` | string | `'Pooled'` | `[Pooled]` | The type of hostpool where this scaling plan should be applied. | +| `location` | string | `[resourceGroup().location]` | | Location for all resources. | +| `roleAssignments` | array | `[]` | | Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalIds' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'. | +| `schedules` | array | `[System.Management.Automation.OrderedHashtable]` | | The schedules related to this scaling plan. If no value is provided a default schedule will be provided. | +| `tags` | object | `{object}` | | Tags of the resource. | +| `timeZone` | string | `'W. Europe Standard Time'` | | Timezone to be used for the scaling plan. | + + +### Parameter Usage: `schedules` + +Multiple schedules can be provided as needed. If a schedule is not provided, a default schedule will be created. + +```json +"schedules" : { + "value": [ + { + "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" + } + ] +} +``` + + + +

+ +Bicep format + +```bicep +'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' + } +] +``` + +
+

+ +### Parameter Usage: `tags` + +Tag names and tag values can be provided as needed. A tag can be left without a value. + +

+ +Parameter JSON format + +```json +"tags": { + "value": { + "Environment": "Non-Prod", + "Contact": "test.user@testcompany.com", + "PurchaseOrder": "1234", + "CostCenter": "7890", + "ServiceName": "DeploymentValidation", + "Role": "DeploymentValidation" + } +} +``` + +
+ +
+ +Bicep format + +```bicep +tags: { + Environment: 'Non-Prod' + Contact: 'test.user@testcompany.com' + PurchaseOrder: '1234' + CostCenter: '7890' + ServiceName: 'DeploymentValidation' + Role: 'DeploymentValidation' +} +``` + +
+

+ +### Parameter Usage: `roleAssignments` + +Create a role assignment for the given resource. If you want to assign a service principal / managed identity that is created in the same deployment, make sure to also specify the `'principalType'` parameter and set it to `'ServicePrincipal'`. This will ensure the role assignment waits for the principal's propagation in Azure. + +

+ +Parameter JSON format + +```json +"roleAssignments": { + "value": [ + { + "roleDefinitionIdOrName": "Reader", + "description": "Reader Role Assignment", + "principalIds": [ + "12345678-1234-1234-1234-123456789012", // object 1 + "78945612-1234-1234-1234-123456789012" // object 2 + ] + }, + { + "roleDefinitionIdOrName": "/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11", + "principalIds": [ + "12345678-1234-1234-1234-123456789012" // object 1 + ], + "principalType": "ServicePrincipal" + } + ] +} +``` + +
+ +
+ +Bicep format + +```bicep +roleAssignments: [ + { + roleDefinitionIdOrName: 'Reader' + description: 'Reader Role Assignment' + principalIds: [ + '12345678-1234-1234-1234-123456789012' // object 1 + '78945612-1234-1234-1234-123456789012' // object 2 + ] + } + { + roleDefinitionIdOrName: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' + principalIds: [ + '12345678-1234-1234-1234-123456789012' // object 1 + ] + principalType: 'ServicePrincipal' + } +] +``` + +
+

+ +## Outputs + +| Output Name | Type | Description | +| :-- | :-- | :-- | +| `location` | string | The location the resource was deployed into. | +| `name` | string | The name of the AVD scaling plan. | +| `resourceGroupName` | string | The resource group the AVD scaling plan was deployed into. | +| `resourceId` | string | The resource ID of the AVD scaling plan. | + +## Cross-referenced modules + +_None_ + +## Deployment examples + +The following module usage examples are retrieved from the content of the files hosted in the module's `.test` folder. + >**Note**: The name of each example is based on the name of the file from which it is taken. + + >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order. + +

Example 1: Common

+ +
+ +via Bicep module + +```bicep +module scalingplans './Microsoft.DesktopVirtualization/scalingplans/deploy.bicep' = { + name: '${uniqueString(deployment().name, location)}-test-dvspcom' + params: { + // Required parameters + name: '<>dvspcom001' + // Non-required parameters + description: 'My Scaling Plan Description' + diagnosticEventHubAuthorizationRuleId: '' + diagnosticEventHubName: '' + diagnosticLogsRetentionInDays: 7 + diagnosticStorageAccountId: '' + diagnosticWorkspaceId: '' + enableDefaultTelemetry: '' + friendlyName: 'My Scaling Plan' + hostPoolType: 'Pooled' + roleAssignments: [ + { + principalIds: [ + '' + ] + principalType: 'ServicePrincipal' + roleDefinitionIdOrName: 'Reader' + } + ] + tags: { + Environment: 'Non-Prod' + Role: 'DeploymentValidation' + } + } +} +``` + +
+

+ +

+ +via JSON Parameter file + +```json +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + // Required parameters + "name": { + "value": "<>dvspcom001" + }, + // Non-required parameters + "description": { + "value": "My Scaling Plan Description" + }, + "diagnosticEventHubAuthorizationRuleId": { + "value": "" + }, + "diagnosticEventHubName": { + "value": "" + }, + "diagnosticLogsRetentionInDays": { + "value": 7 + }, + "diagnosticStorageAccountId": { + "value": "" + }, + "diagnosticWorkspaceId": { + "value": "" + }, + "enableDefaultTelemetry": { + "value": "" + }, + "friendlyName": { + "value": "My Scaling Plan" + }, + "hostPoolType": { + "value": "Pooled" + }, + "roleAssignments": { + "value": [ + { + "principalIds": [ + "" + ], + "principalType": "ServicePrincipal", + "roleDefinitionIdOrName": "Reader" + } + ] + }, + "tags": { + "value": { + "Environment": "Non-Prod", + "Role": "DeploymentValidation" + } + } + } +} +``` + +
+

+ +

Example 2: Min

+ +
+ +via Bicep module + +```bicep +module scalingplans './Microsoft.DesktopVirtualization/scalingplans/deploy.bicep' = { + name: '${uniqueString(deployment().name, location)}-test-dvspmin' + params: { + // Required parameters + name: '<>dvspmin001' + // Non-required parameters + enableDefaultTelemetry: '' + } +} +``` + +
+

+ +

+ +via JSON Parameter file + +```json +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + // Required parameters + "name": { + "value": "<>dvspmin001" + }, + // Non-required parameters + "enableDefaultTelemetry": { + "value": "" + } + } +} +``` + +
+

diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/version.json b/modules/Microsoft.DesktopVirtualization/scalingplans/version.json new file mode 100644 index 0000000000..56f8d9ca40 --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/scalingplans/version.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", + "version": "0.4" +} diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_roleAssignments.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_roleAssignments.bicep new file mode 100644 index 0000000000..7e2b4e3804 --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_roleAssignments.bicep @@ -0,0 +1,82 @@ +@sys.description('Required. The IDs of the principals to assign the role to.') +param principalIds array + +@sys.description('Required. The name of the role to assign. If it cannot be found you can specify the role definition ID instead.') +param roleDefinitionIdOrName string + +@sys.description('Required. The resource ID of the resource to apply the role assignment to.') +param resourceId string + +@sys.description('Optional. The principal type of the assigned principal ID.') +@allowed([ + 'ServicePrincipal' + 'Group' + 'User' + 'ForeignGroup' + 'Device' + '' +]) +param principalType string = '' + +@sys.description('Optional. The description of the role assignment.') +param description string = '' + +@sys.description('Optional. The conditions on the role assignment. This limits the resources it can be assigned to. e.g.: @Resource[Microsoft.Storage/storageAccounts/blobServices/containers:ContainerName] StringEqualsIgnoreCase "foo_storage_container".') +param condition string = '' + +@sys.description('Optional. Version of the condition.') +@allowed([ + '2.0' +]) +param conditionVersion string = '2.0' + +@sys.description('Optional. Id of the delegated managed identity resource.') +param delegatedManagedIdentityResourceId string = '' + +var builtInRoleNames = { + 'Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ca6382a4-1721-4bcf-a114-ff0c70227b6b') + Contributor: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b24988ac-6180-42a0-ab88-20f7382dd24c') + 'Desktop Virtualization Application Group Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '86240b0e-9422-4c43-887b-b61143f32ba8') + 'Desktop Virtualization Application Group Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'aebf23d0-b568-4e86-b8f9-fe83a2c6ab55') + 'Desktop Virtualization Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '082f0a83-3be5-4ba1-904c-961cca79b387') + 'Desktop Virtualization Host Pool Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'e307426c-f9b6-4e81-87de-d99efb3c32bc') + 'Desktop Virtualization Host Pool Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ceadfde2-b300-400a-ab7b-6143895aa822') + 'Desktop Virtualization Power On Off Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '40c5ff49-9181-41f8-ae61-143b0e78555e') + 'Desktop Virtualization Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '49a72310-ab8d-41df-bbb0-79b649203868') + 'Desktop Virtualization Session Host Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2ad6aaab-ead9-4eaa-8ac5-da422f562408') + 'Desktop Virtualization User': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '1d18fff3-a72a-46b5-b4a9-0b38a3cd7e63') + 'Desktop Virtualization User Session Operator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ea4bfff8-7fb4-485a-aadd-d4129a0ffaa6') + 'Desktop Virtualization Virtual Machine Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'a959dbd1-f747-45e3-8ba6-dd80f235f97c') + 'Desktop Virtualization Workspace Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '21efdde3-836f-432b-bf3d-3e8e734d4b2b') + 'Desktop Virtualization Workspace Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '0fa44ee9-7a7d-466b-9bb2-2bf446b1204d') + 'Log Analytics Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '92aaf0da-9dab-42b6-94a3-d43ce8d16293') + 'Log Analytics Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '73c42c96-874c-492b-b04d-ab87d138a893') + 'Managed Application Contributor Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '641177b8-a67a-45b9-a033-47bc880bb21e') + 'Managed Application Operator Role': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'c7393b34-138c-406f-901b-d8cf2b17e6ae') + 'Managed Applications Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'b9331d33-8a36-4f8c-b097-4f54124fdb44') + 'Monitoring Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '749f88d5-cbae-40b8-bcfc-e573ddc772fa') + 'Monitoring Reader': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '43d0d8ad-25c7-4714-9337-8ba259a9fe05') + Owner: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '8e3af657-a8ff-443c-a75c-2fe8c4bcb635') + Reader: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'acdd72a7-3385-48ef-bd42-f606fba81ae7') + 'Resource Policy Contributor': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '36243c78-bf99-498c-9df9-86d9f8d28608') + 'Role Based Access Control Administrator (Preview)': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'f58310d9-a9f6-439a-9e8d-f62e7b41a168') + 'User Access Administrator': subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9') +} + +resource workspace 'Microsoft.DesktopVirtualization/workspaces@2022-09-09' existing = { + name: last(split(resourceId, '/'))! +} + +resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = [for principalId in principalIds: { + name: guid(workspace.id, principalId, roleDefinitionIdOrName) + properties: { + description: description + roleDefinitionId: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName + principalId: principalId + principalType: !empty(principalType) ? any(principalType) : null + condition: !empty(condition) ? condition : null + conditionVersion: !empty(conditionVersion) && !empty(condition) ? conditionVersion : null + delegatedManagedIdentityResourceId: !empty(delegatedManagedIdentityResourceId) ? delegatedManagedIdentityResourceId : null + } + scope: workspace +}] diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/dependencies.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/dependencies.bicep new file mode 100644 index 0000000000..8e753087b2 --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/dependencies.bicep @@ -0,0 +1,41 @@ +@description('Optional. The location to deploy to.') +param location string = resourceGroup().location + +@description('Required. The name of the Managed Identity to create.') +param managedIdentityName string + +@description('Required. The name of the Application Group to create.') +param applicationGroupName string + +@description('Required. The name of the Host Pool to create.') +param hostPoolName string + +resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { + name: managedIdentityName + location: location +} + +resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2022-09-09' = { + name: hostPoolName + location: location + properties: { + hostPoolType: 'Pooled' + loadBalancerType: 'BreadthFirst' + preferredAppGroupType: 'Desktop' + } +} + +resource applicationGroup 'Microsoft.DesktopVirtualization/applicationGroups@2022-09-09' = { + name: applicationGroupName + location: location + properties: { + applicationGroupType: 'Desktop' + hostPoolArmPath: hostPool.id + } +} + +@description('The principal ID of the created Managed Identity.') +output managedIdentityPrincipalId string = managedIdentity.properties.principalId + +@description('The resource ID of the created Application Group.') +output applicationGroupResourceId string = applicationGroup.id diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep new file mode 100644 index 0000000000..4e47af6296 --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep @@ -0,0 +1,91 @@ +targetScope = 'subscription' + +// ========== // +// 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 + +// ============ // +// 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-<>-msi-${serviceShort}' + applicationGroupName: 'dep-<>-appGroup-${serviceShort}' + hostPoolName: 'dep-<>-hp-${serviceShort}' + } +} + +// Diagnostics +// =========== +module diagnosticDependencies '../../../../.shared/.templates/diagnostic.dependencies.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' + params: { + storageAccountName: 'dep<>diasa${serviceShort}01' + logAnalyticsWorkspaceName: 'dep-<>-law-${serviceShort}' + eventHubNamespaceEventHubName: 'dep-<>-evh-${serviceShort}' + eventHubNamespaceName: 'dep-<>-evhns-${serviceShort}' + location: location + } +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + params: { + enableDefaultTelemetry: enableDefaultTelemetry + name: '<>${serviceShort}001' + appGroupResourceIds: [ + nestedDependencies.outputs.applicationGroupResourceId + ] + diagnosticLogsRetentionInDays: 7 + diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId + diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId + diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId + diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName + location: location + lock: 'CanNotDelete' + roleAssignments: [ + { + roleDefinitionIdOrName: 'Reader' + principalIds: [ + nestedDependencies.outputs.managedIdentityPrincipalId + ] + principalType: 'ServicePrincipal' + } + ] + tags: { + Environment: 'Non-Prod' + Role: 'DeploymentValidation' + } + description: 'This is my first AVD Workspace' + friendlyName: 'My first AVD Workspace' + } +} diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep new file mode 100644 index 0000000000..e217769c85 --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep @@ -0,0 +1,42 @@ +targetScope = 'subscription' + +// ========== // +// 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 = 'dvwmin' + +@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +param enableDefaultTelemetry bool = true + +// ============ // +// Dependencies // +// ============ // + +// General resources +// ================= +resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { + name: resourceGroupName + location: location +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' + params: { + enableDefaultTelemetry: enableDefaultTelemetry + name: '<>${serviceShort}001' + } +} diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/deploy.bicep b/modules/Microsoft.DesktopVirtualization/workspaces/deploy.bicep new file mode 100644 index 0000000000..840a2b47f6 --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/workspaces/deploy.bicep @@ -0,0 +1,152 @@ +@sys.description('Required. The name of the workspace to be attach to new Application Group.') +param name string + +@sys.description('Optional. Location for all resources.') +param location string = resourceGroup().location + +@sys.description('Optional. Resource IDs for the existing Application groups this workspace will group together.') +param appGroupResourceIds array = [] + +@sys.description('Optional. The friendly name of the Workspace to be created.') +param friendlyName string = '' + +@sys.description('Optional. The description of the Workspace to be created.') +param description string = '' + +@sys.description('Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely.') +@minValue(0) +@maxValue(365) +param diagnosticLogsRetentionInDays int = 365 + +@sys.description('Optional. Resource ID of the diagnostic storage account.') +param diagnosticStorageAccountId string = '' + +@sys.description('Optional. Resource ID of the diagnostic log analytics workspace.') +param diagnosticWorkspaceId string = '' + +@sys.description('Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to.') +param diagnosticEventHubAuthorizationRuleId string = '' + +@sys.description('Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category.') +param diagnosticEventHubName string = '' + +@allowed([ + '' + 'CanNotDelete' + 'ReadOnly' +]) +@sys.description('Optional. Specify the type of lock.') +param lock string = '' + +@sys.description('Optional. Tags of the resource.') +param tags object = {} + +@sys.description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +param enableDefaultTelemetry bool = true + +@sys.description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalIds\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'.') +param roleAssignments array = [] + +@sys.description('Optional. The name of logs that will be streamed. "allLogs" includes all possible logs for the resource.') +@allowed([ + 'allLogs' + 'Checkpoint' + 'Error' + 'Management' + 'Feed' +]) +param diagnosticLogCategoriesToEnable array = [ + 'allLogs' +] + +@sys.description('Optional. The name of the diagnostic setting, if deployed. If left empty, it defaults to "-diagnosticSettings".') +param diagnosticSettingsName string = '' + +var diagnosticsLogsSpecified = [for category in filter(diagnosticLogCategoriesToEnable, item => item != 'allLogs'): { + category: category + enabled: true + retentionPolicy: { + enabled: true + days: diagnosticLogsRetentionInDays + } +}] + +var diagnosticsLogs = contains(diagnosticLogCategoriesToEnable, 'allLogs') ? [ + { + categoryGroup: 'allLogs' + enabled: true + retentionPolicy: { + enabled: true + days: diagnosticLogsRetentionInDays + } + } +] : diagnosticsLogsSpecified + +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name, location)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } +} + +resource workspace 'Microsoft.DesktopVirtualization/workspaces@2022-09-09' = { + name: name + location: location + tags: tags + properties: { + applicationGroupReferences: appGroupResourceIds + description: description + friendlyName: friendlyName + } +} + +resource workspace_lock 'Microsoft.Authorization/locks@2020-05-01' = if (!empty(lock)) { + name: '${workspace.name}-${lock}-lock' + properties: { + level: any(lock) + notes: lock == 'CanNotDelete' ? 'Cannot delete resource or child resources.' : 'Cannot modify the resource or child resources.' + } + scope: workspace +} + +resource workspace_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@2021-05-01-preview' = if ((!empty(diagnosticStorageAccountId)) || (!empty(diagnosticWorkspaceId)) || (!empty(diagnosticEventHubAuthorizationRuleId)) || (!empty(diagnosticEventHubName))) { + name: !empty(diagnosticSettingsName) ? diagnosticSettingsName : '${name}-diagnosticSettings' + properties: { + storageAccountId: !empty(diagnosticStorageAccountId) ? diagnosticStorageAccountId : null + workspaceId: !empty(diagnosticWorkspaceId) ? diagnosticWorkspaceId : null + eventHubAuthorizationRuleId: !empty(diagnosticEventHubAuthorizationRuleId) ? diagnosticEventHubAuthorizationRuleId : null + eventHubName: !empty(diagnosticEventHubName) ? diagnosticEventHubName : null + logs: diagnosticsLogs + } + scope: workspace +} + +module workspace_roleAssignments '.bicep/nested_roleAssignments.bicep' = [for (roleAssignment, index) in roleAssignments: { + name: '${uniqueString(deployment().name, location)}-Workspace-Rbac-${index}' + params: { + description: contains(roleAssignment, 'description') ? roleAssignment.description : '' + principalIds: roleAssignment.principalIds + principalType: contains(roleAssignment, 'principalType') ? roleAssignment.principalType : '' + roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName + condition: contains(roleAssignment, 'condition') ? roleAssignment.condition : '' + delegatedManagedIdentityResourceId: contains(roleAssignment, 'delegatedManagedIdentityResourceId') ? roleAssignment.delegatedManagedIdentityResourceId : '' + resourceId: workspace.id + } +}] + +@sys.description('The resource ID of the AVD workspace.') +output resourceId string = workspace.id + +@sys.description('The resource group the AVD workspace was deployed into.') +output resourceGroupName string = resourceGroup().name + +@sys.description('The name of the AVD workspace.') +output name string = workspace.name + +@sys.description('The location the resource was deployed into.') +output location string = workspace.location diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/readme.md b/modules/Microsoft.DesktopVirtualization/workspaces/readme.md new file mode 100644 index 0000000000..c8ad45c101 --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/workspaces/readme.md @@ -0,0 +1,333 @@ +# AVD Workspaces `[Microsoft.DesktopVirtualization/workspaces]` + +This module deploys an Azure virtual desktop workspace. + +## Navigation + +- [Resource types](#Resource-types) +- [Parameters](#Parameters) +- [Outputs](#Outputs) +- [Cross-referenced modules](#Cross-referenced-modules) +- [Deployment examples](#Deployment-examples) + +## Resource types + +| Resource Type | API Version | +| :-- | :-- | +| `Microsoft.Authorization/locks` | [2020-05-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2020-05-01/locks) | +| `Microsoft.Authorization/roleAssignments` | [2022-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments) | +| `Microsoft.DesktopVirtualization/workspaces` | [2022-09-09](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2022-09-09/workspaces) | +| `Microsoft.Insights/diagnosticSettings` | [2021-05-01-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) | + +## Parameters + +**Required parameters** + +| Parameter Name | Type | Description | +| :-- | :-- | :-- | +| `name` | string | The name of the workspace to be attach to new Application Group. | + +**Optional parameters** + +| Parameter Name | Type | Default Value | Allowed Values | Description | +| :-- | :-- | :-- | :-- | :-- | +| `appGroupResourceIds` | array | `[]` | | Resource IDs for the existing Application groups this workspace will group together. | +| `description` | string | `''` | | The description of the Workspace to be created. | +| `diagnosticEventHubAuthorizationRuleId` | string | `''` | | Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | +| `diagnosticEventHubName` | string | `''` | | Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | +| `diagnosticLogCategoriesToEnable` | array | `[allLogs]` | `[allLogs, Checkpoint, Error, Feed, Management]` | The name of logs that will be streamed. "allLogs" includes all possible logs for the resource. | +| `diagnosticLogsRetentionInDays` | int | `365` | | Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | +| `diagnosticSettingsName` | string | `''` | | The name of the diagnostic setting, if deployed. If left empty, it defaults to "-diagnosticSettings". | +| `diagnosticStorageAccountId` | string | `''` | | Resource ID of the diagnostic storage account. | +| `diagnosticWorkspaceId` | string | `''` | | Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via a Globally Unique Identifier (GUID). | +| `friendlyName` | string | `''` | | The friendly name of the Workspace to be created. | +| `location` | string | `[resourceGroup().location]` | | Location for all resources. | +| `lock` | string | `''` | `['', CanNotDelete, ReadOnly]` | Specify the type of lock. | +| `roleAssignments` | array | `[]` | | Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalIds' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'. | +| `tags` | object | `{object}` | | Tags of the resource. | + + +### Parameter Usage: `roleAssignments` + +Create a role assignment for the given resource. If you want to assign a service principal / managed identity that is created in the same deployment, make sure to also specify the `'principalType'` parameter and set it to `'ServicePrincipal'`. This will ensure the role assignment waits for the principal's propagation in Azure. + +

+ +Parameter JSON format + +```json +"roleAssignments": { + "value": [ + { + "roleDefinitionIdOrName": "Reader", + "description": "Reader Role Assignment", + "principalIds": [ + "12345678-1234-1234-1234-123456789012", // object 1 + "78945612-1234-1234-1234-123456789012" // object 2 + ] + }, + { + "roleDefinitionIdOrName": "/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11", + "principalIds": [ + "12345678-1234-1234-1234-123456789012" // object 1 + ], + "principalType": "ServicePrincipal" + } + ] +} +``` + +
+ +
+ +Bicep format + +```bicep +roleAssignments: [ + { + roleDefinitionIdOrName: 'Reader' + description: 'Reader Role Assignment' + principalIds: [ + '12345678-1234-1234-1234-123456789012' // object 1 + '78945612-1234-1234-1234-123456789012' // object 2 + ] + } + { + roleDefinitionIdOrName: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' + principalIds: [ + '12345678-1234-1234-1234-123456789012' // object 1 + ] + principalType: 'ServicePrincipal' + } +] +``` + +
+

+ +### Parameter Usage: `tags` + +Tag names and tag values can be provided as needed. A tag can be left without a value. + +

+ +Parameter JSON format + +```json +"tags": { + "value": { + "Environment": "Non-Prod", + "Contact": "test.user@testcompany.com", + "PurchaseOrder": "1234", + "CostCenter": "7890", + "ServiceName": "DeploymentValidation", + "Role": "DeploymentValidation" + } +} +``` + +
+ +
+ +Bicep format + +```bicep +tags: { + Environment: 'Non-Prod' + Contact: 'test.user@testcompany.com' + PurchaseOrder: '1234' + CostCenter: '7890' + ServiceName: 'DeploymentValidation' + Role: 'DeploymentValidation' +} +``` + +
+

+ +## Outputs + +| Output Name | Type | Description | +| :-- | :-- | :-- | +| `location` | string | The location the resource was deployed into. | +| `name` | string | The name of the AVD workspace. | +| `resourceGroupName` | string | The resource group the AVD workspace was deployed into. | +| `resourceId` | string | The resource ID of the AVD workspace. | + +## Cross-referenced modules + +_None_ + +## Deployment examples + +The following module usage examples are retrieved from the content of the files hosted in the module's `.test` folder. + >**Note**: The name of each example is based on the name of the file from which it is taken. + + >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order. + +

Example 1: Common

+ +
+ +via Bicep module + +```bicep +module workspaces './Microsoft.DesktopVirtualization/workspaces/deploy.bicep' = { + name: '${uniqueString(deployment().name, location)}-test-dvwcom' + params: { + // Required parameters + name: '<>dvwcom001' + // Non-required parameters + appGroupResourceIds: [ + '' + ] + description: 'This is my first AVD Workspace' + diagnosticEventHubAuthorizationRuleId: '' + diagnosticEventHubName: '' + diagnosticLogsRetentionInDays: 7 + diagnosticStorageAccountId: '' + diagnosticWorkspaceId: '' + enableDefaultTelemetry: '' + friendlyName: 'My first AVD Workspace' + location: '' + lock: 'CanNotDelete' + roleAssignments: [ + { + principalIds: [ + '' + ] + principalType: 'ServicePrincipal' + roleDefinitionIdOrName: 'Reader' + } + ] + tags: { + Environment: 'Non-Prod' + Role: 'DeploymentValidation' + } + } +} +``` + +
+

+ +

+ +via JSON Parameter file + +```json +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + // Required parameters + "name": { + "value": "<>dvwcom001" + }, + // Non-required parameters + "appGroupResourceIds": { + "value": [ + "" + ] + }, + "description": { + "value": "This is my first AVD Workspace" + }, + "diagnosticEventHubAuthorizationRuleId": { + "value": "" + }, + "diagnosticEventHubName": { + "value": "" + }, + "diagnosticLogsRetentionInDays": { + "value": 7 + }, + "diagnosticStorageAccountId": { + "value": "" + }, + "diagnosticWorkspaceId": { + "value": "" + }, + "enableDefaultTelemetry": { + "value": "" + }, + "friendlyName": { + "value": "My first AVD Workspace" + }, + "location": { + "value": "" + }, + "lock": { + "value": "CanNotDelete" + }, + "roleAssignments": { + "value": [ + { + "principalIds": [ + "" + ], + "principalType": "ServicePrincipal", + "roleDefinitionIdOrName": "Reader" + } + ] + }, + "tags": { + "value": { + "Environment": "Non-Prod", + "Role": "DeploymentValidation" + } + } + } +} +``` + +
+

+ +

Example 2: Min

+ +
+ +via Bicep module + +```bicep +module workspaces './Microsoft.DesktopVirtualization/workspaces/deploy.bicep' = { + name: '${uniqueString(deployment().name, location)}-test-dvwmin' + params: { + // Required parameters + name: '<>dvwmin001' + // Non-required parameters + enableDefaultTelemetry: '' + } +} +``` + +
+

+ +

+ +via JSON Parameter file + +```json +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + // Required parameters + "name": { + "value": "<>dvwmin001" + }, + // Non-required parameters + "enableDefaultTelemetry": { + "value": "" + } + } +} +``` + +
+

diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/version.json b/modules/Microsoft.DesktopVirtualization/workspaces/version.json new file mode 100644 index 0000000000..56f8d9ca40 --- /dev/null +++ b/modules/Microsoft.DesktopVirtualization/workspaces/version.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", + "version": "0.4" +} From 0070151806a5e2f1be883cbb2b04db591faf466c Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Thu, 4 May 2023 17:43:04 +0200 Subject: [PATCH 10/63] rename rp and readme rename --- .../applicationgroups/.bicep/nested_roleAssignments.bicep | 0 .../applicationgroups/.test/common/dependencies.bicep | 0 .../applicationgroups/.test/common/deploy.test.bicep | 0 .../applicationgroups/.test/min/dependencies.bicep | 0 .../applicationgroups/.test/min/deploy.test.bicep | 0 .../applicationgroups/README.md} | 0 .../applicationgroups/applications/README.md} | 0 .../applicationgroups/applications/deploy.bicep | 0 .../applicationgroups/applications/version.json | 0 .../applicationgroups/deploy.bicep | 0 .../applicationgroups/version.json | 0 .../hostpools/.bicep/nested_roleAssignments.bicep | 0 .../hostpools/.test/common/dependencies.bicep | 0 .../hostpools/.test/common/deploy.test.bicep | 0 .../hostpools/.test/min/deploy.test.bicep | 0 .../readme.md => DesktopVirtualization/hostpools/README.md} | 0 .../hostpools/deploy.bicep | 0 .../hostpools/version.json | 0 .../scalingplans/.bicep/nested_roleAssignments.bicep | 0 .../scalingplans/.test/common/dependencies.bicep | 0 .../scalingplans/.test/common/deploy.test.bicep | 0 .../scalingplans/.test/min/deploy.test.bicep | 0 .../readme.md => DesktopVirtualization/scalingplans/README.md} | 0 .../scalingplans/deploy.bicep | 0 .../scalingplans/version.json | 0 .../workspaces/.bicep/nested_roleAssignments.bicep | 0 .../workspaces/.test/common/dependencies.bicep | 0 .../workspaces/.test/common/deploy.test.bicep | 0 .../workspaces/.test/min/deploy.test.bicep | 0 .../readme.md => DesktopVirtualization/workspaces/README.md} | 0 .../workspaces/deploy.bicep | 0 .../workspaces/version.json | 0 32 files changed, 0 insertions(+), 0 deletions(-) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/applicationgroups/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/applicationgroups/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/applicationgroups/.test/common/deploy.test.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/applicationgroups/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/applicationgroups/.test/min/deploy.test.bicep (100%) rename modules/{Microsoft.DesktopVirtualization/applicationgroups/readme.md => DesktopVirtualization/applicationgroups/README.md} (100%) rename modules/{Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md => DesktopVirtualization/applicationgroups/applications/README.md} (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/applicationgroups/applications/deploy.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/applicationgroups/applications/version.json (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/applicationgroups/deploy.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/applicationgroups/version.json (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/hostpools/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/hostpools/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/hostpools/.test/common/deploy.test.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/hostpools/.test/min/deploy.test.bicep (100%) rename modules/{Microsoft.DesktopVirtualization/hostpools/readme.md => DesktopVirtualization/hostpools/README.md} (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/hostpools/deploy.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/hostpools/version.json (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/scalingplans/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/scalingplans/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/scalingplans/.test/common/deploy.test.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/scalingplans/.test/min/deploy.test.bicep (100%) rename modules/{Microsoft.DesktopVirtualization/scalingplans/readme.md => DesktopVirtualization/scalingplans/README.md} (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/scalingplans/deploy.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/scalingplans/version.json (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/workspaces/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/workspaces/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/workspaces/.test/common/deploy.test.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/workspaces/.test/min/deploy.test.bicep (100%) rename modules/{Microsoft.DesktopVirtualization/workspaces/readme.md => DesktopVirtualization/workspaces/README.md} (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/workspaces/deploy.bicep (100%) rename modules/{Microsoft.DesktopVirtualization => DesktopVirtualization}/workspaces/version.json (100%) diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_roleAssignments.bicep b/modules/DesktopVirtualization/applicationgroups/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_roleAssignments.bicep rename to modules/DesktopVirtualization/applicationgroups/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/common/dependencies.bicep b/modules/DesktopVirtualization/applicationgroups/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/.test/common/dependencies.bicep rename to modules/DesktopVirtualization/applicationgroups/.test/common/dependencies.bicep diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/common/deploy.test.bicep b/modules/DesktopVirtualization/applicationgroups/.test/common/deploy.test.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/.test/common/deploy.test.bicep rename to modules/DesktopVirtualization/applicationgroups/.test/common/deploy.test.bicep diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min/dependencies.bicep b/modules/DesktopVirtualization/applicationgroups/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min/dependencies.bicep rename to modules/DesktopVirtualization/applicationgroups/.test/min/dependencies.bicep diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min/deploy.test.bicep b/modules/DesktopVirtualization/applicationgroups/.test/min/deploy.test.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/.test/min/deploy.test.bicep rename to modules/DesktopVirtualization/applicationgroups/.test/min/deploy.test.bicep diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/readme.md b/modules/DesktopVirtualization/applicationgroups/README.md similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/readme.md rename to modules/DesktopVirtualization/applicationgroups/README.md diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md b/modules/DesktopVirtualization/applicationgroups/applications/README.md similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md rename to modules/DesktopVirtualization/applicationgroups/applications/README.md diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep b/modules/DesktopVirtualization/applicationgroups/applications/deploy.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep rename to modules/DesktopVirtualization/applicationgroups/applications/deploy.bicep diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json b/modules/DesktopVirtualization/applicationgroups/applications/version.json similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json rename to modules/DesktopVirtualization/applicationgroups/applications/version.json diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep b/modules/DesktopVirtualization/applicationgroups/deploy.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep rename to modules/DesktopVirtualization/applicationgroups/deploy.bicep diff --git a/modules/Microsoft.DesktopVirtualization/applicationgroups/version.json b/modules/DesktopVirtualization/applicationgroups/version.json similarity index 100% rename from modules/Microsoft.DesktopVirtualization/applicationgroups/version.json rename to modules/DesktopVirtualization/applicationgroups/version.json diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_roleAssignments.bicep b/modules/DesktopVirtualization/hostpools/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_roleAssignments.bicep rename to modules/DesktopVirtualization/hostpools/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/.test/common/dependencies.bicep b/modules/DesktopVirtualization/hostpools/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/hostpools/.test/common/dependencies.bicep rename to modules/DesktopVirtualization/hostpools/.test/common/dependencies.bicep diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/.test/common/deploy.test.bicep b/modules/DesktopVirtualization/hostpools/.test/common/deploy.test.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/hostpools/.test/common/deploy.test.bicep rename to modules/DesktopVirtualization/hostpools/.test/common/deploy.test.bicep diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/.test/min/deploy.test.bicep b/modules/DesktopVirtualization/hostpools/.test/min/deploy.test.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/hostpools/.test/min/deploy.test.bicep rename to modules/DesktopVirtualization/hostpools/.test/min/deploy.test.bicep diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/readme.md b/modules/DesktopVirtualization/hostpools/README.md similarity index 100% rename from modules/Microsoft.DesktopVirtualization/hostpools/readme.md rename to modules/DesktopVirtualization/hostpools/README.md diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/deploy.bicep b/modules/DesktopVirtualization/hostpools/deploy.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/hostpools/deploy.bicep rename to modules/DesktopVirtualization/hostpools/deploy.bicep diff --git a/modules/Microsoft.DesktopVirtualization/hostpools/version.json b/modules/DesktopVirtualization/hostpools/version.json similarity index 100% rename from modules/Microsoft.DesktopVirtualization/hostpools/version.json rename to modules/DesktopVirtualization/hostpools/version.json diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_roleAssignments.bicep b/modules/DesktopVirtualization/scalingplans/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/scalingplans/.bicep/nested_roleAssignments.bicep rename to modules/DesktopVirtualization/scalingplans/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/.test/common/dependencies.bicep b/modules/DesktopVirtualization/scalingplans/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/scalingplans/.test/common/dependencies.bicep rename to modules/DesktopVirtualization/scalingplans/.test/common/dependencies.bicep diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/.test/common/deploy.test.bicep b/modules/DesktopVirtualization/scalingplans/.test/common/deploy.test.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/scalingplans/.test/common/deploy.test.bicep rename to modules/DesktopVirtualization/scalingplans/.test/common/deploy.test.bicep diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/.test/min/deploy.test.bicep b/modules/DesktopVirtualization/scalingplans/.test/min/deploy.test.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/scalingplans/.test/min/deploy.test.bicep rename to modules/DesktopVirtualization/scalingplans/.test/min/deploy.test.bicep diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/readme.md b/modules/DesktopVirtualization/scalingplans/README.md similarity index 100% rename from modules/Microsoft.DesktopVirtualization/scalingplans/readme.md rename to modules/DesktopVirtualization/scalingplans/README.md diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/deploy.bicep b/modules/DesktopVirtualization/scalingplans/deploy.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/scalingplans/deploy.bicep rename to modules/DesktopVirtualization/scalingplans/deploy.bicep diff --git a/modules/Microsoft.DesktopVirtualization/scalingplans/version.json b/modules/DesktopVirtualization/scalingplans/version.json similarity index 100% rename from modules/Microsoft.DesktopVirtualization/scalingplans/version.json rename to modules/DesktopVirtualization/scalingplans/version.json diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_roleAssignments.bicep b/modules/DesktopVirtualization/workspaces/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_roleAssignments.bicep rename to modules/DesktopVirtualization/workspaces/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/dependencies.bicep b/modules/DesktopVirtualization/workspaces/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/workspaces/.test/common/dependencies.bicep rename to modules/DesktopVirtualization/workspaces/.test/common/dependencies.bicep diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep b/modules/DesktopVirtualization/workspaces/.test/common/deploy.test.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/workspaces/.test/common/deploy.test.bicep rename to modules/DesktopVirtualization/workspaces/.test/common/deploy.test.bicep diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep b/modules/DesktopVirtualization/workspaces/.test/min/deploy.test.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/workspaces/.test/min/deploy.test.bicep rename to modules/DesktopVirtualization/workspaces/.test/min/deploy.test.bicep diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/readme.md b/modules/DesktopVirtualization/workspaces/README.md similarity index 100% rename from modules/Microsoft.DesktopVirtualization/workspaces/readme.md rename to modules/DesktopVirtualization/workspaces/README.md diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/deploy.bicep b/modules/DesktopVirtualization/workspaces/deploy.bicep similarity index 100% rename from modules/Microsoft.DesktopVirtualization/workspaces/deploy.bicep rename to modules/DesktopVirtualization/workspaces/deploy.bicep diff --git a/modules/Microsoft.DesktopVirtualization/workspaces/version.json b/modules/DesktopVirtualization/workspaces/version.json similarity index 100% rename from modules/Microsoft.DesktopVirtualization/workspaces/version.json rename to modules/DesktopVirtualization/workspaces/version.json From 7c369d13f1520799fde35ae2c9ceec342f090688 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Fri, 5 May 2023 19:06:39 +0200 Subject: [PATCH 11/63] rename avd module files --- .../.test/common/{deploy.test.bicep => main.test.bicep} | 0 .../.test/min/{deploy.test.bicep => main.test.bicep} | 0 .../applicationgroups/applications/{deploy.bicep => main.bicep} | 0 .../applicationgroups/{deploy.bicep => main.bicep} | 0 .../hostpools/.test/common/{deploy.test.bicep => main.test.bicep} | 0 .../hostpools/.test/min/{deploy.test.bicep => main.test.bicep} | 0 .../DesktopVirtualization/hostpools/{deploy.bicep => main.bicep} | 0 .../.test/common/{deploy.test.bicep => main.test.bicep} | 0 .../scalingplans/.test/min/{deploy.test.bicep => main.test.bicep} | 0 .../scalingplans/{deploy.bicep => main.bicep} | 0 .../.test/common/{deploy.test.bicep => main.test.bicep} | 0 .../workspaces/.test/min/{deploy.test.bicep => main.test.bicep} | 0 .../DesktopVirtualization/workspaces/{deploy.bicep => main.bicep} | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename modules/DesktopVirtualization/applicationgroups/.test/common/{deploy.test.bicep => main.test.bicep} (100%) rename modules/DesktopVirtualization/applicationgroups/.test/min/{deploy.test.bicep => main.test.bicep} (100%) rename modules/DesktopVirtualization/applicationgroups/applications/{deploy.bicep => main.bicep} (100%) rename modules/DesktopVirtualization/applicationgroups/{deploy.bicep => main.bicep} (100%) rename modules/DesktopVirtualization/hostpools/.test/common/{deploy.test.bicep => main.test.bicep} (100%) rename modules/DesktopVirtualization/hostpools/.test/min/{deploy.test.bicep => main.test.bicep} (100%) rename modules/DesktopVirtualization/hostpools/{deploy.bicep => main.bicep} (100%) rename modules/DesktopVirtualization/scalingplans/.test/common/{deploy.test.bicep => main.test.bicep} (100%) rename modules/DesktopVirtualization/scalingplans/.test/min/{deploy.test.bicep => main.test.bicep} (100%) rename modules/DesktopVirtualization/scalingplans/{deploy.bicep => main.bicep} (100%) rename modules/DesktopVirtualization/workspaces/.test/common/{deploy.test.bicep => main.test.bicep} (100%) rename modules/DesktopVirtualization/workspaces/.test/min/{deploy.test.bicep => main.test.bicep} (100%) rename modules/DesktopVirtualization/workspaces/{deploy.bicep => main.bicep} (100%) diff --git a/modules/DesktopVirtualization/applicationgroups/.test/common/deploy.test.bicep b/modules/DesktopVirtualization/applicationgroups/.test/common/main.test.bicep similarity index 100% rename from modules/DesktopVirtualization/applicationgroups/.test/common/deploy.test.bicep rename to modules/DesktopVirtualization/applicationgroups/.test/common/main.test.bicep diff --git a/modules/DesktopVirtualization/applicationgroups/.test/min/deploy.test.bicep b/modules/DesktopVirtualization/applicationgroups/.test/min/main.test.bicep similarity index 100% rename from modules/DesktopVirtualization/applicationgroups/.test/min/deploy.test.bicep rename to modules/DesktopVirtualization/applicationgroups/.test/min/main.test.bicep diff --git a/modules/DesktopVirtualization/applicationgroups/applications/deploy.bicep b/modules/DesktopVirtualization/applicationgroups/applications/main.bicep similarity index 100% rename from modules/DesktopVirtualization/applicationgroups/applications/deploy.bicep rename to modules/DesktopVirtualization/applicationgroups/applications/main.bicep diff --git a/modules/DesktopVirtualization/applicationgroups/deploy.bicep b/modules/DesktopVirtualization/applicationgroups/main.bicep similarity index 100% rename from modules/DesktopVirtualization/applicationgroups/deploy.bicep rename to modules/DesktopVirtualization/applicationgroups/main.bicep diff --git a/modules/DesktopVirtualization/hostpools/.test/common/deploy.test.bicep b/modules/DesktopVirtualization/hostpools/.test/common/main.test.bicep similarity index 100% rename from modules/DesktopVirtualization/hostpools/.test/common/deploy.test.bicep rename to modules/DesktopVirtualization/hostpools/.test/common/main.test.bicep diff --git a/modules/DesktopVirtualization/hostpools/.test/min/deploy.test.bicep b/modules/DesktopVirtualization/hostpools/.test/min/main.test.bicep similarity index 100% rename from modules/DesktopVirtualization/hostpools/.test/min/deploy.test.bicep rename to modules/DesktopVirtualization/hostpools/.test/min/main.test.bicep diff --git a/modules/DesktopVirtualization/hostpools/deploy.bicep b/modules/DesktopVirtualization/hostpools/main.bicep similarity index 100% rename from modules/DesktopVirtualization/hostpools/deploy.bicep rename to modules/DesktopVirtualization/hostpools/main.bicep diff --git a/modules/DesktopVirtualization/scalingplans/.test/common/deploy.test.bicep b/modules/DesktopVirtualization/scalingplans/.test/common/main.test.bicep similarity index 100% rename from modules/DesktopVirtualization/scalingplans/.test/common/deploy.test.bicep rename to modules/DesktopVirtualization/scalingplans/.test/common/main.test.bicep diff --git a/modules/DesktopVirtualization/scalingplans/.test/min/deploy.test.bicep b/modules/DesktopVirtualization/scalingplans/.test/min/main.test.bicep similarity index 100% rename from modules/DesktopVirtualization/scalingplans/.test/min/deploy.test.bicep rename to modules/DesktopVirtualization/scalingplans/.test/min/main.test.bicep diff --git a/modules/DesktopVirtualization/scalingplans/deploy.bicep b/modules/DesktopVirtualization/scalingplans/main.bicep similarity index 100% rename from modules/DesktopVirtualization/scalingplans/deploy.bicep rename to modules/DesktopVirtualization/scalingplans/main.bicep diff --git a/modules/DesktopVirtualization/workspaces/.test/common/deploy.test.bicep b/modules/DesktopVirtualization/workspaces/.test/common/main.test.bicep similarity index 100% rename from modules/DesktopVirtualization/workspaces/.test/common/deploy.test.bicep rename to modules/DesktopVirtualization/workspaces/.test/common/main.test.bicep diff --git a/modules/DesktopVirtualization/workspaces/.test/min/deploy.test.bicep b/modules/DesktopVirtualization/workspaces/.test/min/main.test.bicep similarity index 100% rename from modules/DesktopVirtualization/workspaces/.test/min/deploy.test.bicep rename to modules/DesktopVirtualization/workspaces/.test/min/main.test.bicep diff --git a/modules/DesktopVirtualization/workspaces/deploy.bicep b/modules/DesktopVirtualization/workspaces/main.bicep similarity index 100% rename from modules/DesktopVirtualization/workspaces/deploy.bicep rename to modules/DesktopVirtualization/workspaces/main.bicep From e274e3bdddc6d7f60b122166d2381bc4439e19de Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Fri, 5 May 2023 19:09:12 +0200 Subject: [PATCH 12/63] replace avd module references --- .../applicationgroups/.test/common/main.test.bicep | 2 +- .../applicationgroups/.test/min/main.test.bicep | 2 +- modules/DesktopVirtualization/applicationgroups/main.bicep | 2 +- .../hostpools/.test/common/main.test.bicep | 2 +- .../DesktopVirtualization/hostpools/.test/min/main.test.bicep | 2 +- .../scalingplans/.test/common/main.test.bicep | 2 +- .../scalingplans/.test/min/main.test.bicep | 2 +- .../workspaces/.test/common/main.test.bicep | 2 +- .../DesktopVirtualization/workspaces/.test/min/main.test.bicep | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/DesktopVirtualization/applicationgroups/.test/common/main.test.bicep b/modules/DesktopVirtualization/applicationgroups/.test/common/main.test.bicep index 4eb0f92416..988caadfda 100644 --- a/modules/DesktopVirtualization/applicationgroups/.test/common/main.test.bicep +++ b/modules/DesktopVirtualization/applicationgroups/.test/common/main.test.bicep @@ -55,7 +55,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../deploy.bicep' = { +module testDeployment '../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/DesktopVirtualization/applicationgroups/.test/min/main.test.bicep b/modules/DesktopVirtualization/applicationgroups/.test/min/main.test.bicep index 518b3e2cc1..0b379f1021 100644 --- a/modules/DesktopVirtualization/applicationgroups/.test/min/main.test.bicep +++ b/modules/DesktopVirtualization/applicationgroups/.test/min/main.test.bicep @@ -40,7 +40,7 @@ module nestedDependencies 'dependencies.bicep' = { // Test Execution // // ============== // -module testDeployment '../../deploy.bicep' = { +module testDeployment '../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/DesktopVirtualization/applicationgroups/main.bicep b/modules/DesktopVirtualization/applicationgroups/main.bicep index d12d05bd5a..c555b15aab 100644 --- a/modules/DesktopVirtualization/applicationgroups/main.bicep +++ b/modules/DesktopVirtualization/applicationgroups/main.bicep @@ -143,7 +143,7 @@ resource appGroup_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@2021 scope: appGroup } -module appGroup_applications 'applications/deploy.bicep' = [for (application, index) in applications: { +module appGroup_applications 'applications/main.bicep' = [for (application, index) in applications: { name: '${uniqueString(deployment().name, location)}-AppGroup-App-${index}' params: { name: application.name diff --git a/modules/DesktopVirtualization/hostpools/.test/common/main.test.bicep b/modules/DesktopVirtualization/hostpools/.test/common/main.test.bicep index e2b7715a47..4cdfaa6044 100644 --- a/modules/DesktopVirtualization/hostpools/.test/common/main.test.bicep +++ b/modules/DesktopVirtualization/hostpools/.test/common/main.test.bicep @@ -54,7 +54,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../deploy.bicep' = { +module testDeployment '../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/DesktopVirtualization/hostpools/.test/min/main.test.bicep b/modules/DesktopVirtualization/hostpools/.test/min/main.test.bicep index 4c9a96927a..8fca5586ed 100644 --- a/modules/DesktopVirtualization/hostpools/.test/min/main.test.bicep +++ b/modules/DesktopVirtualization/hostpools/.test/min/main.test.bicep @@ -32,7 +32,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../deploy.bicep' = { +module testDeployment '../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/DesktopVirtualization/scalingplans/.test/common/main.test.bicep b/modules/DesktopVirtualization/scalingplans/.test/common/main.test.bicep index dbc7e02f62..33cf9b7b37 100644 --- a/modules/DesktopVirtualization/scalingplans/.test/common/main.test.bicep +++ b/modules/DesktopVirtualization/scalingplans/.test/common/main.test.bicep @@ -54,7 +54,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../deploy.bicep' = { +module testDeployment '../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/DesktopVirtualization/scalingplans/.test/min/main.test.bicep b/modules/DesktopVirtualization/scalingplans/.test/min/main.test.bicep index 9ca3365a0a..88bf6ca33d 100644 --- a/modules/DesktopVirtualization/scalingplans/.test/min/main.test.bicep +++ b/modules/DesktopVirtualization/scalingplans/.test/min/main.test.bicep @@ -32,7 +32,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../deploy.bicep' = { +module testDeployment '../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/DesktopVirtualization/workspaces/.test/common/main.test.bicep b/modules/DesktopVirtualization/workspaces/.test/common/main.test.bicep index 4e47af6296..abcf793678 100644 --- a/modules/DesktopVirtualization/workspaces/.test/common/main.test.bicep +++ b/modules/DesktopVirtualization/workspaces/.test/common/main.test.bicep @@ -56,7 +56,7 @@ module diagnosticDependencies '../../../../.shared/.templates/diagnostic.depende // Test Execution // // ============== // -module testDeployment '../../deploy.bicep' = { +module testDeployment '../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { diff --git a/modules/DesktopVirtualization/workspaces/.test/min/main.test.bicep b/modules/DesktopVirtualization/workspaces/.test/min/main.test.bicep index e217769c85..a1c095378e 100644 --- a/modules/DesktopVirtualization/workspaces/.test/min/main.test.bicep +++ b/modules/DesktopVirtualization/workspaces/.test/min/main.test.bicep @@ -32,7 +32,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { // Test Execution // // ============== // -module testDeployment '../../deploy.bicep' = { +module testDeployment '../../main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { From 800b96978e702b87936538ea01d405d36af4cc12 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Fri, 5 May 2023 19:31:24 +0200 Subject: [PATCH 13/63] ms prefix workflows avd --- .github/workflows/ms.desktopvirtualization.hostpools.yml | 4 ++-- .github/workflows/ms.desktopvirtualization.scalingplans.yml | 4 ++-- .github/workflows/ms.desktopvirtualization.workspaces.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ms.desktopvirtualization.hostpools.yml b/.github/workflows/ms.desktopvirtualization.hostpools.yml index c205f64f16..d711ae80ae 100644 --- a/.github/workflows/ms.desktopvirtualization.hostpools.yml +++ b/.github/workflows/ms.desktopvirtualization.hostpools.yml @@ -30,13 +30,13 @@ on: - '.github/actions/templates/**' - '.github/workflows/template.module.yml' - '.github/workflows/ms.desktopvirtualization.hostpools.yml' - - 'modules/Microsoft.DesktopVirtualization/hostpools/**' + - 'modules/DesktopVirtualization/hostpools/**' - 'utilities/pipelines/**' - '!utilities/pipelines/deploymentRemoval/**' - '!*/**/readme.md' env: - modulePath: 'modules/Microsoft.DesktopVirtualization/hostpools' + modulePath: 'modules/DesktopVirtualization/hostpools' workflowPath: '.github/workflows/ms.desktopvirtualization.hostpools.yml' concurrency: diff --git a/.github/workflows/ms.desktopvirtualization.scalingplans.yml b/.github/workflows/ms.desktopvirtualization.scalingplans.yml index 67a75c9cd8..af8fb1a703 100644 --- a/.github/workflows/ms.desktopvirtualization.scalingplans.yml +++ b/.github/workflows/ms.desktopvirtualization.scalingplans.yml @@ -30,13 +30,13 @@ on: - '.github/actions/templates/**' - '.github/workflows/template.module.yml' - '.github/workflows/ms.desktopvirtualization.scalingplans.yml' - - 'modules/Microsoft.DesktopVirtualization/scalingplans/**' + - 'modules/DesktopVirtualization/scalingplans/**' - 'utilities/pipelines/**' - '!utilities/pipelines/deploymentRemoval/**' - '!*/**/readme.md' env: - modulePath: 'modules/Microsoft.DesktopVirtualization/scalingplans' + modulePath: 'modules/DesktopVirtualization/scalingplans' workflowPath: '.github/workflows/ms.desktopvirtualization.scalingplans.yml' concurrency: diff --git a/.github/workflows/ms.desktopvirtualization.workspaces.yml b/.github/workflows/ms.desktopvirtualization.workspaces.yml index 67759f1bf3..1c6de58056 100644 --- a/.github/workflows/ms.desktopvirtualization.workspaces.yml +++ b/.github/workflows/ms.desktopvirtualization.workspaces.yml @@ -30,13 +30,13 @@ on: - '.github/actions/templates/**' - '.github/workflows/template.module.yml' - '.github/workflows/ms.desktopvirtualization.workspaces.yml' - - 'modules/Microsoft.DesktopVirtualization/workspaces/**' + - 'modules/DesktopVirtualization/workspaces/**' - 'utilities/pipelines/**' - '!utilities/pipelines/deploymentRemoval/**' - '!*/**/readme.md' env: - modulePath: 'modules/Microsoft.DesktopVirtualization/workspaces' + modulePath: 'modules/DesktopVirtualization/workspaces' workflowPath: '.github/workflows/ms.desktopvirtualization.workspaces.yml' concurrency: From f9b73072106cee013450fdaf89f87f41ee05476b Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Fri, 5 May 2023 19:36:39 +0200 Subject: [PATCH 14/63] readme in tests --- .../pipelines/staticValidation/module.tests.ps1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/utilities/pipelines/staticValidation/module.tests.ps1 b/utilities/pipelines/staticValidation/module.tests.ps1 index 33a4169655..4ef4a45457 100644 --- a/utilities/pipelines/staticValidation/module.tests.ps1 +++ b/utilities/pipelines/staticValidation/module.tests.ps1 @@ -61,13 +61,13 @@ Describe 'File/folder tests' -Tag 'Modules' { ($hasARM -or $hasBicep) | Should -Be $true } - It '[] Module should contain a [` readme.md `] file.' -TestCases $moduleFolderTestCases { + It '[] Module should contain a [` README.md `] file.' -TestCases $moduleFolderTestCases { param( [string] $moduleFolderPath ) - $pathExisting = Test-Path (Join-Path -Path $moduleFolderPath 'readme.md') + $pathExisting = Test-Path (Join-Path -Path $moduleFolderPath 'README.md') $pathExisting | Should -Be $true } @@ -346,15 +346,15 @@ Describe 'Readme tests' -Tag 'Readme' { moduleFolderPath = $moduleFolderPath templateContent = $templateContent templateFilePath = $templateFilePath - readMeFilePath = Join-Path -Path $moduleFolderPath 'readme.md' - readMeContent = Get-Content (Join-Path -Path $moduleFolderPath 'readme.md') + readMeFilePath = Join-Path -Path $moduleFolderPath 'README.md' + readMeContent = Get-Content (Join-Path -Path $moduleFolderPath 'README.md') isTopLevelModule = $resourceTypeIdentifier.Split('/').Count -eq 2 # / resourceTypeIdentifier = $resourceTypeIdentifier templateReferences = $crossReferencedModuleList[$resourceTypeIdentifier] } } - It '[] `Readme.md` file should not be empty.' -TestCases $readmeFolderTestCases { + It '[] `README.md` file should not be empty.' -TestCases $readmeFolderTestCases { param( [string] $moduleFolderName, @@ -363,7 +363,7 @@ Describe 'Readme tests' -Tag 'Readme' { $readMeContent | Should -Not -Be $null } - It '[] `Readme.md` file should contain these sections in order: Navigation, Resource Types, Parameters, Outputs, Cross-referenced modules, Deployment examples.' -TestCases $readmeFolderTestCases { + It '[] `README.md` file should contain these sections in order: Navigation, Resource Types, Parameters, Outputs, Cross-referenced modules, Deployment examples.' -TestCases $readmeFolderTestCases { param( [string] $moduleFolderName, From 621e40df6198395c3bfe10125ebae231ef3c4a62 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Fri, 5 May 2023 19:40:55 +0200 Subject: [PATCH 15/63] foldername workflows avd --- .../workflows/ms.desktopvirtualization.applicationgroups.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ms.desktopvirtualization.applicationgroups.yml b/.github/workflows/ms.desktopvirtualization.applicationgroups.yml index ee5b3e1620..4005dd5ad6 100644 --- a/.github/workflows/ms.desktopvirtualization.applicationgroups.yml +++ b/.github/workflows/ms.desktopvirtualization.applicationgroups.yml @@ -30,13 +30,13 @@ on: - '.github/actions/templates/**' - '.github/workflows/template.module.yml' - '.github/workflows/ms.desktopvirtualization.applicationgroups.yml' - - 'modules/desktop-virtualization/application-groups/**' + - 'modules/DesktopVirtualization/applicationGroups/**' - 'utilities/pipelines/**' - '!utilities/pipelines/deploymentRemoval/**' - '!*/**/readme.md' env: - modulePath: 'modules/desktop-virtualization/application-groups' + modulePath: 'modules/DesktopVirtualization/applicationGroups' workflowPath: '.github/workflows/ms.desktopvirtualization.applicationgroups.yml' concurrency: From 2c3b9d7dc441490ac4d0e46cfd7db96cd666e553 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Fri, 5 May 2023 19:41:43 +0200 Subject: [PATCH 16/63] foldername avd --- .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../{applicationgroups => applicationGroups2}/README.md | 0 .../applications/README.md | 0 .../applications/main.bicep | 0 .../applications/version.json | 0 .../{applicationgroups => applicationGroups2}/main.bicep | 0 .../{applicationgroups => applicationGroups2}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../{scalingplans => scalingPlans2}/.test/common/main.test.bicep | 0 .../{scalingplans => scalingPlans2}/.test/min/main.test.bicep | 0 .../{scalingplans => scalingPlans2}/README.md | 0 .../{scalingplans => scalingPlans2}/main.bicep | 0 .../{scalingplans => scalingPlans2}/version.json | 0 18 files changed, 0 insertions(+), 0 deletions(-) rename modules/DesktopVirtualization/{applicationgroups => applicationGroups2}/.bicep/nested_roleAssignments.bicep (100%) rename modules/DesktopVirtualization/{applicationgroups => applicationGroups2}/.test/common/dependencies.bicep (100%) rename modules/DesktopVirtualization/{applicationgroups => applicationGroups2}/.test/common/main.test.bicep (100%) rename modules/DesktopVirtualization/{applicationgroups => applicationGroups2}/.test/min/dependencies.bicep (100%) rename modules/DesktopVirtualization/{applicationgroups => applicationGroups2}/.test/min/main.test.bicep (100%) rename modules/DesktopVirtualization/{applicationgroups => applicationGroups2}/README.md (100%) rename modules/DesktopVirtualization/{applicationgroups => applicationGroups2}/applications/README.md (100%) rename modules/DesktopVirtualization/{applicationgroups => applicationGroups2}/applications/main.bicep (100%) rename modules/DesktopVirtualization/{applicationgroups => applicationGroups2}/applications/version.json (100%) rename modules/DesktopVirtualization/{applicationgroups => applicationGroups2}/main.bicep (100%) rename modules/DesktopVirtualization/{applicationgroups => applicationGroups2}/version.json (100%) rename modules/DesktopVirtualization/{scalingplans => scalingPlans2}/.bicep/nested_roleAssignments.bicep (100%) rename modules/DesktopVirtualization/{scalingplans => scalingPlans2}/.test/common/dependencies.bicep (100%) rename modules/DesktopVirtualization/{scalingplans => scalingPlans2}/.test/common/main.test.bicep (100%) rename modules/DesktopVirtualization/{scalingplans => scalingPlans2}/.test/min/main.test.bicep (100%) rename modules/DesktopVirtualization/{scalingplans => scalingPlans2}/README.md (100%) rename modules/DesktopVirtualization/{scalingplans => scalingPlans2}/main.bicep (100%) rename modules/DesktopVirtualization/{scalingplans => scalingPlans2}/version.json (100%) diff --git a/modules/DesktopVirtualization/applicationgroups/.bicep/nested_roleAssignments.bicep b/modules/DesktopVirtualization/applicationGroups2/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/DesktopVirtualization/applicationgroups/.bicep/nested_roleAssignments.bicep rename to modules/DesktopVirtualization/applicationGroups2/.bicep/nested_roleAssignments.bicep diff --git a/modules/DesktopVirtualization/applicationgroups/.test/common/dependencies.bicep b/modules/DesktopVirtualization/applicationGroups2/.test/common/dependencies.bicep similarity index 100% rename from modules/DesktopVirtualization/applicationgroups/.test/common/dependencies.bicep rename to modules/DesktopVirtualization/applicationGroups2/.test/common/dependencies.bicep diff --git a/modules/DesktopVirtualization/applicationgroups/.test/common/main.test.bicep b/modules/DesktopVirtualization/applicationGroups2/.test/common/main.test.bicep similarity index 100% rename from modules/DesktopVirtualization/applicationgroups/.test/common/main.test.bicep rename to modules/DesktopVirtualization/applicationGroups2/.test/common/main.test.bicep diff --git a/modules/DesktopVirtualization/applicationgroups/.test/min/dependencies.bicep b/modules/DesktopVirtualization/applicationGroups2/.test/min/dependencies.bicep similarity index 100% rename from modules/DesktopVirtualization/applicationgroups/.test/min/dependencies.bicep rename to modules/DesktopVirtualization/applicationGroups2/.test/min/dependencies.bicep diff --git a/modules/DesktopVirtualization/applicationgroups/.test/min/main.test.bicep b/modules/DesktopVirtualization/applicationGroups2/.test/min/main.test.bicep similarity index 100% rename from modules/DesktopVirtualization/applicationgroups/.test/min/main.test.bicep rename to modules/DesktopVirtualization/applicationGroups2/.test/min/main.test.bicep diff --git a/modules/DesktopVirtualization/applicationgroups/README.md b/modules/DesktopVirtualization/applicationGroups2/README.md similarity index 100% rename from modules/DesktopVirtualization/applicationgroups/README.md rename to modules/DesktopVirtualization/applicationGroups2/README.md diff --git a/modules/DesktopVirtualization/applicationgroups/applications/README.md b/modules/DesktopVirtualization/applicationGroups2/applications/README.md similarity index 100% rename from modules/DesktopVirtualization/applicationgroups/applications/README.md rename to modules/DesktopVirtualization/applicationGroups2/applications/README.md diff --git a/modules/DesktopVirtualization/applicationgroups/applications/main.bicep b/modules/DesktopVirtualization/applicationGroups2/applications/main.bicep similarity index 100% rename from modules/DesktopVirtualization/applicationgroups/applications/main.bicep rename to modules/DesktopVirtualization/applicationGroups2/applications/main.bicep diff --git a/modules/DesktopVirtualization/applicationgroups/applications/version.json b/modules/DesktopVirtualization/applicationGroups2/applications/version.json similarity index 100% rename from modules/DesktopVirtualization/applicationgroups/applications/version.json rename to modules/DesktopVirtualization/applicationGroups2/applications/version.json diff --git a/modules/DesktopVirtualization/applicationgroups/main.bicep b/modules/DesktopVirtualization/applicationGroups2/main.bicep similarity index 100% rename from modules/DesktopVirtualization/applicationgroups/main.bicep rename to modules/DesktopVirtualization/applicationGroups2/main.bicep diff --git a/modules/DesktopVirtualization/applicationgroups/version.json b/modules/DesktopVirtualization/applicationGroups2/version.json similarity index 100% rename from modules/DesktopVirtualization/applicationgroups/version.json rename to modules/DesktopVirtualization/applicationGroups2/version.json diff --git a/modules/DesktopVirtualization/scalingplans/.bicep/nested_roleAssignments.bicep b/modules/DesktopVirtualization/scalingPlans2/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/DesktopVirtualization/scalingplans/.bicep/nested_roleAssignments.bicep rename to modules/DesktopVirtualization/scalingPlans2/.bicep/nested_roleAssignments.bicep diff --git a/modules/DesktopVirtualization/scalingplans/.test/common/dependencies.bicep b/modules/DesktopVirtualization/scalingPlans2/.test/common/dependencies.bicep similarity index 100% rename from modules/DesktopVirtualization/scalingplans/.test/common/dependencies.bicep rename to modules/DesktopVirtualization/scalingPlans2/.test/common/dependencies.bicep diff --git a/modules/DesktopVirtualization/scalingplans/.test/common/main.test.bicep b/modules/DesktopVirtualization/scalingPlans2/.test/common/main.test.bicep similarity index 100% rename from modules/DesktopVirtualization/scalingplans/.test/common/main.test.bicep rename to modules/DesktopVirtualization/scalingPlans2/.test/common/main.test.bicep diff --git a/modules/DesktopVirtualization/scalingplans/.test/min/main.test.bicep b/modules/DesktopVirtualization/scalingPlans2/.test/min/main.test.bicep similarity index 100% rename from modules/DesktopVirtualization/scalingplans/.test/min/main.test.bicep rename to modules/DesktopVirtualization/scalingPlans2/.test/min/main.test.bicep diff --git a/modules/DesktopVirtualization/scalingplans/README.md b/modules/DesktopVirtualization/scalingPlans2/README.md similarity index 100% rename from modules/DesktopVirtualization/scalingplans/README.md rename to modules/DesktopVirtualization/scalingPlans2/README.md diff --git a/modules/DesktopVirtualization/scalingplans/main.bicep b/modules/DesktopVirtualization/scalingPlans2/main.bicep similarity index 100% rename from modules/DesktopVirtualization/scalingplans/main.bicep rename to modules/DesktopVirtualization/scalingPlans2/main.bicep diff --git a/modules/DesktopVirtualization/scalingplans/version.json b/modules/DesktopVirtualization/scalingPlans2/version.json similarity index 100% rename from modules/DesktopVirtualization/scalingplans/version.json rename to modules/DesktopVirtualization/scalingPlans2/version.json From f2d2a58272fd2f267c062a5e7e9e118fe7af764a Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Fri, 5 May 2023 19:42:05 +0200 Subject: [PATCH 17/63] foldername avdback --- .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../{applicationGroups2 => applicationGroups}/README.md | 0 .../applications/README.md | 0 .../applications/main.bicep | 0 .../applications/version.json | 0 .../{applicationGroups2 => applicationGroups}/main.bicep | 0 .../{applicationGroups2 => applicationGroups}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../{scalingPlans2 => scalingPlans}/.test/common/main.test.bicep | 0 .../{scalingPlans2 => scalingPlans}/.test/min/main.test.bicep | 0 .../{scalingPlans2 => scalingPlans}/README.md | 0 .../{scalingPlans2 => scalingPlans}/main.bicep | 0 .../{scalingPlans2 => scalingPlans}/version.json | 0 18 files changed, 0 insertions(+), 0 deletions(-) rename modules/DesktopVirtualization/{applicationGroups2 => applicationGroups}/.bicep/nested_roleAssignments.bicep (100%) rename modules/DesktopVirtualization/{applicationGroups2 => applicationGroups}/.test/common/dependencies.bicep (100%) rename modules/DesktopVirtualization/{applicationGroups2 => applicationGroups}/.test/common/main.test.bicep (100%) rename modules/DesktopVirtualization/{applicationGroups2 => applicationGroups}/.test/min/dependencies.bicep (100%) rename modules/DesktopVirtualization/{applicationGroups2 => applicationGroups}/.test/min/main.test.bicep (100%) rename modules/DesktopVirtualization/{applicationGroups2 => applicationGroups}/README.md (100%) rename modules/DesktopVirtualization/{applicationGroups2 => applicationGroups}/applications/README.md (100%) rename modules/DesktopVirtualization/{applicationGroups2 => applicationGroups}/applications/main.bicep (100%) rename modules/DesktopVirtualization/{applicationGroups2 => applicationGroups}/applications/version.json (100%) rename modules/DesktopVirtualization/{applicationGroups2 => applicationGroups}/main.bicep (100%) rename modules/DesktopVirtualization/{applicationGroups2 => applicationGroups}/version.json (100%) rename modules/DesktopVirtualization/{scalingPlans2 => scalingPlans}/.bicep/nested_roleAssignments.bicep (100%) rename modules/DesktopVirtualization/{scalingPlans2 => scalingPlans}/.test/common/dependencies.bicep (100%) rename modules/DesktopVirtualization/{scalingPlans2 => scalingPlans}/.test/common/main.test.bicep (100%) rename modules/DesktopVirtualization/{scalingPlans2 => scalingPlans}/.test/min/main.test.bicep (100%) rename modules/DesktopVirtualization/{scalingPlans2 => scalingPlans}/README.md (100%) rename modules/DesktopVirtualization/{scalingPlans2 => scalingPlans}/main.bicep (100%) rename modules/DesktopVirtualization/{scalingPlans2 => scalingPlans}/version.json (100%) diff --git a/modules/DesktopVirtualization/applicationGroups2/.bicep/nested_roleAssignments.bicep b/modules/DesktopVirtualization/applicationGroups/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/DesktopVirtualization/applicationGroups2/.bicep/nested_roleAssignments.bicep rename to modules/DesktopVirtualization/applicationGroups/.bicep/nested_roleAssignments.bicep diff --git a/modules/DesktopVirtualization/applicationGroups2/.test/common/dependencies.bicep b/modules/DesktopVirtualization/applicationGroups/.test/common/dependencies.bicep similarity index 100% rename from modules/DesktopVirtualization/applicationGroups2/.test/common/dependencies.bicep rename to modules/DesktopVirtualization/applicationGroups/.test/common/dependencies.bicep diff --git a/modules/DesktopVirtualization/applicationGroups2/.test/common/main.test.bicep b/modules/DesktopVirtualization/applicationGroups/.test/common/main.test.bicep similarity index 100% rename from modules/DesktopVirtualization/applicationGroups2/.test/common/main.test.bicep rename to modules/DesktopVirtualization/applicationGroups/.test/common/main.test.bicep diff --git a/modules/DesktopVirtualization/applicationGroups2/.test/min/dependencies.bicep b/modules/DesktopVirtualization/applicationGroups/.test/min/dependencies.bicep similarity index 100% rename from modules/DesktopVirtualization/applicationGroups2/.test/min/dependencies.bicep rename to modules/DesktopVirtualization/applicationGroups/.test/min/dependencies.bicep diff --git a/modules/DesktopVirtualization/applicationGroups2/.test/min/main.test.bicep b/modules/DesktopVirtualization/applicationGroups/.test/min/main.test.bicep similarity index 100% rename from modules/DesktopVirtualization/applicationGroups2/.test/min/main.test.bicep rename to modules/DesktopVirtualization/applicationGroups/.test/min/main.test.bicep diff --git a/modules/DesktopVirtualization/applicationGroups2/README.md b/modules/DesktopVirtualization/applicationGroups/README.md similarity index 100% rename from modules/DesktopVirtualization/applicationGroups2/README.md rename to modules/DesktopVirtualization/applicationGroups/README.md diff --git a/modules/DesktopVirtualization/applicationGroups2/applications/README.md b/modules/DesktopVirtualization/applicationGroups/applications/README.md similarity index 100% rename from modules/DesktopVirtualization/applicationGroups2/applications/README.md rename to modules/DesktopVirtualization/applicationGroups/applications/README.md diff --git a/modules/DesktopVirtualization/applicationGroups2/applications/main.bicep b/modules/DesktopVirtualization/applicationGroups/applications/main.bicep similarity index 100% rename from modules/DesktopVirtualization/applicationGroups2/applications/main.bicep rename to modules/DesktopVirtualization/applicationGroups/applications/main.bicep diff --git a/modules/DesktopVirtualization/applicationGroups2/applications/version.json b/modules/DesktopVirtualization/applicationGroups/applications/version.json similarity index 100% rename from modules/DesktopVirtualization/applicationGroups2/applications/version.json rename to modules/DesktopVirtualization/applicationGroups/applications/version.json diff --git a/modules/DesktopVirtualization/applicationGroups2/main.bicep b/modules/DesktopVirtualization/applicationGroups/main.bicep similarity index 100% rename from modules/DesktopVirtualization/applicationGroups2/main.bicep rename to modules/DesktopVirtualization/applicationGroups/main.bicep diff --git a/modules/DesktopVirtualization/applicationGroups2/version.json b/modules/DesktopVirtualization/applicationGroups/version.json similarity index 100% rename from modules/DesktopVirtualization/applicationGroups2/version.json rename to modules/DesktopVirtualization/applicationGroups/version.json diff --git a/modules/DesktopVirtualization/scalingPlans2/.bicep/nested_roleAssignments.bicep b/modules/DesktopVirtualization/scalingPlans/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/DesktopVirtualization/scalingPlans2/.bicep/nested_roleAssignments.bicep rename to modules/DesktopVirtualization/scalingPlans/.bicep/nested_roleAssignments.bicep diff --git a/modules/DesktopVirtualization/scalingPlans2/.test/common/dependencies.bicep b/modules/DesktopVirtualization/scalingPlans/.test/common/dependencies.bicep similarity index 100% rename from modules/DesktopVirtualization/scalingPlans2/.test/common/dependencies.bicep rename to modules/DesktopVirtualization/scalingPlans/.test/common/dependencies.bicep diff --git a/modules/DesktopVirtualization/scalingPlans2/.test/common/main.test.bicep b/modules/DesktopVirtualization/scalingPlans/.test/common/main.test.bicep similarity index 100% rename from modules/DesktopVirtualization/scalingPlans2/.test/common/main.test.bicep rename to modules/DesktopVirtualization/scalingPlans/.test/common/main.test.bicep diff --git a/modules/DesktopVirtualization/scalingPlans2/.test/min/main.test.bicep b/modules/DesktopVirtualization/scalingPlans/.test/min/main.test.bicep similarity index 100% rename from modules/DesktopVirtualization/scalingPlans2/.test/min/main.test.bicep rename to modules/DesktopVirtualization/scalingPlans/.test/min/main.test.bicep diff --git a/modules/DesktopVirtualization/scalingPlans2/README.md b/modules/DesktopVirtualization/scalingPlans/README.md similarity index 100% rename from modules/DesktopVirtualization/scalingPlans2/README.md rename to modules/DesktopVirtualization/scalingPlans/README.md diff --git a/modules/DesktopVirtualization/scalingPlans2/main.bicep b/modules/DesktopVirtualization/scalingPlans/main.bicep similarity index 100% rename from modules/DesktopVirtualization/scalingPlans2/main.bicep rename to modules/DesktopVirtualization/scalingPlans/main.bicep diff --git a/modules/DesktopVirtualization/scalingPlans2/version.json b/modules/DesktopVirtualization/scalingPlans/version.json similarity index 100% rename from modules/DesktopVirtualization/scalingPlans2/version.json rename to modules/DesktopVirtualization/scalingPlans/version.json From 6171110dfebe0f6e9604678c1dce9ce82ac5ce43 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Fri, 5 May 2023 19:42:49 +0200 Subject: [PATCH 18/63] foldername workflows avd sp --- .github/workflows/ms.desktopvirtualization.scalingplans.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ms.desktopvirtualization.scalingplans.yml b/.github/workflows/ms.desktopvirtualization.scalingplans.yml index af8fb1a703..8bc47be9f3 100644 --- a/.github/workflows/ms.desktopvirtualization.scalingplans.yml +++ b/.github/workflows/ms.desktopvirtualization.scalingplans.yml @@ -30,13 +30,13 @@ on: - '.github/actions/templates/**' - '.github/workflows/template.module.yml' - '.github/workflows/ms.desktopvirtualization.scalingplans.yml' - - 'modules/DesktopVirtualization/scalingplans/**' + - 'modules/DesktopVirtualization/scalingPlans2/**' - 'utilities/pipelines/**' - '!utilities/pipelines/deploymentRemoval/**' - '!*/**/readme.md' env: - modulePath: 'modules/DesktopVirtualization/scalingplans' + modulePath: 'modules/DesktopVirtualization/scalingPlans2' workflowPath: '.github/workflows/ms.desktopvirtualization.scalingplans.yml' concurrency: From d4df88b09c071391f0edeffcb8bc6a2ca8930797 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Fri, 5 May 2023 19:43:12 +0200 Subject: [PATCH 19/63] foldername workflows avd sp back --- .github/workflows/ms.desktopvirtualization.scalingplans.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ms.desktopvirtualization.scalingplans.yml b/.github/workflows/ms.desktopvirtualization.scalingplans.yml index 8bc47be9f3..48ec4a7e9a 100644 --- a/.github/workflows/ms.desktopvirtualization.scalingplans.yml +++ b/.github/workflows/ms.desktopvirtualization.scalingplans.yml @@ -30,13 +30,13 @@ on: - '.github/actions/templates/**' - '.github/workflows/template.module.yml' - '.github/workflows/ms.desktopvirtualization.scalingplans.yml' - - 'modules/DesktopVirtualization/scalingPlans2/**' + - 'modules/DesktopVirtualization/scalingPlans/**' - 'utilities/pipelines/**' - '!utilities/pipelines/deploymentRemoval/**' - '!*/**/readme.md' env: - modulePath: 'modules/DesktopVirtualization/scalingPlans2' + modulePath: 'modules/DesktopVirtualization/scalingPlans' workflowPath: '.github/workflows/ms.desktopvirtualization.scalingplans.yml' concurrency: From a2d1b199c5c419cb82eeb02b4e203b026e89f336 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Fri, 5 May 2023 19:57:30 +0200 Subject: [PATCH 20/63] foldername workflows avd hp --- .../{hostpools => hostPools2}/.bicep/nested_roleAssignments.bicep | 0 .../{hostpools => hostPools2}/.test/common/dependencies.bicep | 0 .../{hostpools => hostPools2}/.test/common/main.test.bicep | 0 .../{hostpools => hostPools2}/.test/min/main.test.bicep | 0 modules/DesktopVirtualization/{hostpools => hostPools2}/README.md | 0 .../DesktopVirtualization/{hostpools => hostPools2}/main.bicep | 0 .../DesktopVirtualization/{hostpools => hostPools2}/version.json | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename modules/DesktopVirtualization/{hostpools => hostPools2}/.bicep/nested_roleAssignments.bicep (100%) rename modules/DesktopVirtualization/{hostpools => hostPools2}/.test/common/dependencies.bicep (100%) rename modules/DesktopVirtualization/{hostpools => hostPools2}/.test/common/main.test.bicep (100%) rename modules/DesktopVirtualization/{hostpools => hostPools2}/.test/min/main.test.bicep (100%) rename modules/DesktopVirtualization/{hostpools => hostPools2}/README.md (100%) rename modules/DesktopVirtualization/{hostpools => hostPools2}/main.bicep (100%) rename modules/DesktopVirtualization/{hostpools => hostPools2}/version.json (100%) diff --git a/modules/DesktopVirtualization/hostpools/.bicep/nested_roleAssignments.bicep b/modules/DesktopVirtualization/hostPools2/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/DesktopVirtualization/hostpools/.bicep/nested_roleAssignments.bicep rename to modules/DesktopVirtualization/hostPools2/.bicep/nested_roleAssignments.bicep diff --git a/modules/DesktopVirtualization/hostpools/.test/common/dependencies.bicep b/modules/DesktopVirtualization/hostPools2/.test/common/dependencies.bicep similarity index 100% rename from modules/DesktopVirtualization/hostpools/.test/common/dependencies.bicep rename to modules/DesktopVirtualization/hostPools2/.test/common/dependencies.bicep diff --git a/modules/DesktopVirtualization/hostpools/.test/common/main.test.bicep b/modules/DesktopVirtualization/hostPools2/.test/common/main.test.bicep similarity index 100% rename from modules/DesktopVirtualization/hostpools/.test/common/main.test.bicep rename to modules/DesktopVirtualization/hostPools2/.test/common/main.test.bicep diff --git a/modules/DesktopVirtualization/hostpools/.test/min/main.test.bicep b/modules/DesktopVirtualization/hostPools2/.test/min/main.test.bicep similarity index 100% rename from modules/DesktopVirtualization/hostpools/.test/min/main.test.bicep rename to modules/DesktopVirtualization/hostPools2/.test/min/main.test.bicep diff --git a/modules/DesktopVirtualization/hostpools/README.md b/modules/DesktopVirtualization/hostPools2/README.md similarity index 100% rename from modules/DesktopVirtualization/hostpools/README.md rename to modules/DesktopVirtualization/hostPools2/README.md diff --git a/modules/DesktopVirtualization/hostpools/main.bicep b/modules/DesktopVirtualization/hostPools2/main.bicep similarity index 100% rename from modules/DesktopVirtualization/hostpools/main.bicep rename to modules/DesktopVirtualization/hostPools2/main.bicep diff --git a/modules/DesktopVirtualization/hostpools/version.json b/modules/DesktopVirtualization/hostPools2/version.json similarity index 100% rename from modules/DesktopVirtualization/hostpools/version.json rename to modules/DesktopVirtualization/hostPools2/version.json From e630746c7f14edaf8df71a195a97f5e1c1be0d5c Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Fri, 5 May 2023 19:57:50 +0200 Subject: [PATCH 21/63] foldername workflows avd hp back --- .../{hostPools2 => hostPools}/.bicep/nested_roleAssignments.bicep | 0 .../{hostPools2 => hostPools}/.test/common/dependencies.bicep | 0 .../{hostPools2 => hostPools}/.test/common/main.test.bicep | 0 .../{hostPools2 => hostPools}/.test/min/main.test.bicep | 0 modules/DesktopVirtualization/{hostPools2 => hostPools}/README.md | 0 .../DesktopVirtualization/{hostPools2 => hostPools}/main.bicep | 0 .../DesktopVirtualization/{hostPools2 => hostPools}/version.json | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename modules/DesktopVirtualization/{hostPools2 => hostPools}/.bicep/nested_roleAssignments.bicep (100%) rename modules/DesktopVirtualization/{hostPools2 => hostPools}/.test/common/dependencies.bicep (100%) rename modules/DesktopVirtualization/{hostPools2 => hostPools}/.test/common/main.test.bicep (100%) rename modules/DesktopVirtualization/{hostPools2 => hostPools}/.test/min/main.test.bicep (100%) rename modules/DesktopVirtualization/{hostPools2 => hostPools}/README.md (100%) rename modules/DesktopVirtualization/{hostPools2 => hostPools}/main.bicep (100%) rename modules/DesktopVirtualization/{hostPools2 => hostPools}/version.json (100%) diff --git a/modules/DesktopVirtualization/hostPools2/.bicep/nested_roleAssignments.bicep b/modules/DesktopVirtualization/hostPools/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/DesktopVirtualization/hostPools2/.bicep/nested_roleAssignments.bicep rename to modules/DesktopVirtualization/hostPools/.bicep/nested_roleAssignments.bicep diff --git a/modules/DesktopVirtualization/hostPools2/.test/common/dependencies.bicep b/modules/DesktopVirtualization/hostPools/.test/common/dependencies.bicep similarity index 100% rename from modules/DesktopVirtualization/hostPools2/.test/common/dependencies.bicep rename to modules/DesktopVirtualization/hostPools/.test/common/dependencies.bicep diff --git a/modules/DesktopVirtualization/hostPools2/.test/common/main.test.bicep b/modules/DesktopVirtualization/hostPools/.test/common/main.test.bicep similarity index 100% rename from modules/DesktopVirtualization/hostPools2/.test/common/main.test.bicep rename to modules/DesktopVirtualization/hostPools/.test/common/main.test.bicep diff --git a/modules/DesktopVirtualization/hostPools2/.test/min/main.test.bicep b/modules/DesktopVirtualization/hostPools/.test/min/main.test.bicep similarity index 100% rename from modules/DesktopVirtualization/hostPools2/.test/min/main.test.bicep rename to modules/DesktopVirtualization/hostPools/.test/min/main.test.bicep diff --git a/modules/DesktopVirtualization/hostPools2/README.md b/modules/DesktopVirtualization/hostPools/README.md similarity index 100% rename from modules/DesktopVirtualization/hostPools2/README.md rename to modules/DesktopVirtualization/hostPools/README.md diff --git a/modules/DesktopVirtualization/hostPools2/main.bicep b/modules/DesktopVirtualization/hostPools/main.bicep similarity index 100% rename from modules/DesktopVirtualization/hostPools2/main.bicep rename to modules/DesktopVirtualization/hostPools/main.bicep diff --git a/modules/DesktopVirtualization/hostPools2/version.json b/modules/DesktopVirtualization/hostPools/version.json similarity index 100% rename from modules/DesktopVirtualization/hostPools2/version.json rename to modules/DesktopVirtualization/hostPools/version.json From fa84d51e917cf70f99ab8181083fc459ae0d85e7 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Fri, 5 May 2023 19:59:42 +0200 Subject: [PATCH 22/63] foldername hp --- .github/workflows/ms.desktopvirtualization.hostpools.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ms.desktopvirtualization.hostpools.yml b/.github/workflows/ms.desktopvirtualization.hostpools.yml index d711ae80ae..3349f71f42 100644 --- a/.github/workflows/ms.desktopvirtualization.hostpools.yml +++ b/.github/workflows/ms.desktopvirtualization.hostpools.yml @@ -30,13 +30,13 @@ on: - '.github/actions/templates/**' - '.github/workflows/template.module.yml' - '.github/workflows/ms.desktopvirtualization.hostpools.yml' - - 'modules/DesktopVirtualization/hostpools/**' + - 'modules/DesktopVirtualization/hostPools2/**' - 'utilities/pipelines/**' - '!utilities/pipelines/deploymentRemoval/**' - '!*/**/readme.md' env: - modulePath: 'modules/DesktopVirtualization/hostpools' + modulePath: 'modules/DesktopVirtualization/hostPools2' workflowPath: '.github/workflows/ms.desktopvirtualization.hostpools.yml' concurrency: From 09a6c56961df3507cf7c974b2f8ba39481e5846f Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Fri, 5 May 2023 20:00:11 +0200 Subject: [PATCH 23/63] foldername hp back --- .github/workflows/ms.desktopvirtualization.hostpools.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ms.desktopvirtualization.hostpools.yml b/.github/workflows/ms.desktopvirtualization.hostpools.yml index 3349f71f42..ad7a8d91b8 100644 --- a/.github/workflows/ms.desktopvirtualization.hostpools.yml +++ b/.github/workflows/ms.desktopvirtualization.hostpools.yml @@ -30,13 +30,13 @@ on: - '.github/actions/templates/**' - '.github/workflows/template.module.yml' - '.github/workflows/ms.desktopvirtualization.hostpools.yml' - - 'modules/DesktopVirtualization/hostPools2/**' + - 'modules/DesktopVirtualization/hostPools/**' - 'utilities/pipelines/**' - '!utilities/pipelines/deploymentRemoval/**' - '!*/**/readme.md' env: - modulePath: 'modules/DesktopVirtualization/hostPools2' + modulePath: 'modules/DesktopVirtualization/hostPools' workflowPath: '.github/workflows/ms.desktopvirtualization.hostpools.yml' concurrency: From 4906e291d1af4f129a23a1654826133eab18e6db Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Sat, 6 May 2023 16:28:39 +0200 Subject: [PATCH 24/63] fix leftover --- .../ms.desktopvirtualization.applicationgroups.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml index 60af6b2eed..a20016eed9 100644 --- a/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml +++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml @@ -29,7 +29,7 @@ trigger: include: - '/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml' - '/.azuredevops/pipelineTemplates/*.yml' - - '/modules/desktop-virtualization/application-groups/*' + - '/modules/DesktopVirtualization/applicationGroups/*' - '/utilities/pipelines/*' exclude: - '/utilities/pipelines/deploymentRemoval/*' @@ -39,7 +39,7 @@ variables: - template: '../../settings.yml' - group: 'PLATFORM_VARIABLES' - name: modulePath - value: '/modules/desktop-virtualization/application-groups' + value: '/modules/DesktopVirtualization/applicationGroups' stages: - template: /.azuredevops/pipelineTemplates/stages.module.yml From cc5c2c40149bfe7e2bcc2aae338704144611098f Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 17:28:42 +0200 Subject: [PATCH 25/63] temp pester --- utilities/pipelines/staticValidation/module.tests.ps1 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/utilities/pipelines/staticValidation/module.tests.ps1 b/utilities/pipelines/staticValidation/module.tests.ps1 index 4ef4a45457..f8cf35a79e 100644 --- a/utilities/pipelines/staticValidation/module.tests.ps1 +++ b/utilities/pipelines/staticValidation/module.tests.ps1 @@ -657,6 +657,12 @@ Describe 'Readme tests' -Tag 'Readme' { [string] $readMeFilePath ) + # TODO Remove beginning + Write-Output "moduleFolderName: $moduleFolderName" + Write-Output "templateFilePath: $templateFilePath" + Write-Output "readMeFilePath: $readMeFilePath" + # TODO Remove end + # Get current hash $fileHashBefore = (Get-FileHash $readMeFilePath).Hash From 01799be533994bdb6759c3c6244063c843de0178 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 17:40:14 +0200 Subject: [PATCH 26/63] temp pester else --- .../applicationGroups/README.md | 4 ++-- .../pipelines/staticValidation/module.tests.ps1 | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/DesktopVirtualization/applicationGroups/README.md b/modules/DesktopVirtualization/applicationGroups/README.md index 46de067ef2..ad530ac04f 100644 --- a/modules/DesktopVirtualization/applicationGroups/README.md +++ b/modules/DesktopVirtualization/applicationGroups/README.md @@ -178,7 +178,7 @@ The following module usage examples are retrieved from the content of the files

via Bicep module ```bicep -module applicationgroups './Microsoft.DesktopVirtualization/applicationgroups/main.bicep' = { +module applicationGroups './DesktopVirtualization/applicationGroups/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dvagcom' params: { // Required parameters @@ -335,7 +335,7 @@ module applicationgroups './Microsoft.DesktopVirtualization/applicationgroups/ma via Bicep module ```bicep -module applicationgroups './Microsoft.DesktopVirtualization/applicationgroups/main.bicep' = { +module applicationGroups './DesktopVirtualization/applicationGroups/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dvagmin' params: { // Required parameters diff --git a/utilities/pipelines/staticValidation/module.tests.ps1 b/utilities/pipelines/staticValidation/module.tests.ps1 index f8cf35a79e..944fa61459 100644 --- a/utilities/pipelines/staticValidation/module.tests.ps1 +++ b/utilities/pipelines/staticValidation/module.tests.ps1 @@ -657,11 +657,7 @@ Describe 'Readme tests' -Tag 'Readme' { [string] $readMeFilePath ) - # TODO Remove beginning - Write-Output "moduleFolderName: $moduleFolderName" - Write-Output "templateFilePath: $templateFilePath" - Write-Output "readMeFilePath: $readMeFilePath" - # TODO Remove end + # Get current hash $fileHashBefore = (Get-FileHash $readMeFilePath).Hash @@ -683,6 +679,12 @@ Describe 'Readme tests' -Tag 'Readme' { # Reset readme file to original state git checkout HEAD -- $readMeFilePath + } else { + # TODO Remove beginning + Write-Output "moduleFolderName: $moduleFolderName" + Write-Output "templateFilePath: $templateFilePath" + Write-Output "readMeFilePath: $readMeFilePath" + # TODO Remove end } $mdFormattedDiff = ($diffReponse -join '
') -replace '\|', '\|' From 05de06d5ade95c72413fe131f90dcbe61e8c1b76 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 17:45:09 +0200 Subject: [PATCH 27/63] temp pester else out --- .../pipelines/staticValidation/module.tests.ps1 | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/utilities/pipelines/staticValidation/module.tests.ps1 b/utilities/pipelines/staticValidation/module.tests.ps1 index 944fa61459..f4ab2496ca 100644 --- a/utilities/pipelines/staticValidation/module.tests.ps1 +++ b/utilities/pipelines/staticValidation/module.tests.ps1 @@ -657,7 +657,11 @@ Describe 'Readme tests' -Tag 'Readme' { [string] $readMeFilePath ) - + # TODO Remove beginning + Write-Warning ("moduleFolderName: $moduleFolderName") -Verbose + Write-Warning ("templateFilePath: $templateFilePath") -Verbose + Write-Warning ("readMeFilePath: $readMeFilePath") -Verbose + # TODO Remove end # Get current hash $fileHashBefore = (Get-FileHash $readMeFilePath).Hash @@ -679,12 +683,6 @@ Describe 'Readme tests' -Tag 'Readme' { # Reset readme file to original state git checkout HEAD -- $readMeFilePath - } else { - # TODO Remove beginning - Write-Output "moduleFolderName: $moduleFolderName" - Write-Output "templateFilePath: $templateFilePath" - Write-Output "readMeFilePath: $readMeFilePath" - # TODO Remove end } $mdFormattedDiff = ($diffReponse -join '
') -replace '\|', '\|' From 957b4770202f0cba6fb2010457a74f39eed44e8c Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 17:49:43 +0200 Subject: [PATCH 28/63] temp pester else out --- utilities/pipelines/staticValidation/module.tests.ps1 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/utilities/pipelines/staticValidation/module.tests.ps1 b/utilities/pipelines/staticValidation/module.tests.ps1 index f4ab2496ca..04b7fb62dd 100644 --- a/utilities/pipelines/staticValidation/module.tests.ps1 +++ b/utilities/pipelines/staticValidation/module.tests.ps1 @@ -658,9 +658,9 @@ Describe 'Readme tests' -Tag 'Readme' { ) # TODO Remove beginning - Write-Warning ("moduleFolderName: $moduleFolderName") -Verbose - Write-Warning ("templateFilePath: $templateFilePath") -Verbose - Write-Warning ("readMeFilePath: $readMeFilePath") -Verbose + Write-Verbose ("moduleFolderName: $moduleFolderName") -Verbose + Write-Verbose ("templateFilePath: $templateFilePath") -Verbose + Write-Verbose ("readMeFilePath: $readMeFilePath") -Verbose # TODO Remove end # Get current hash @@ -675,6 +675,11 @@ Describe 'Readme tests' -Tag 'Readme' { # Get hash after 'update' $fileHashAfter = (Get-FileHash $readMeFilePath).Hash + # TODO Remove beginning + Write-Verbose ("fileHashBefore: $fileHashBefore") -Verbose + Write-Verbose ("fileHashAfter: $fileHashAfter") -Verbose + # TODO Remove end + # Compare $filesAreTheSame = $fileHashBefore -eq $fileHashAfter if (-not $filesAreTheSame) { From 2b9cb805bf11b480d07759698279a1b45b3a2120 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 17:53:31 +0200 Subject: [PATCH 29/63] call set-modulereadme --- utilities/pipelines/staticValidation/module.tests.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/utilities/pipelines/staticValidation/module.tests.ps1 b/utilities/pipelines/staticValidation/module.tests.ps1 index 04b7fb62dd..f19b549a45 100644 --- a/utilities/pipelines/staticValidation/module.tests.ps1 +++ b/utilities/pipelines/staticValidation/module.tests.ps1 @@ -661,6 +661,7 @@ Describe 'Readme tests' -Tag 'Readme' { Write-Verbose ("moduleFolderName: $moduleFolderName") -Verbose Write-Verbose ("templateFilePath: $templateFilePath") -Verbose Write-Verbose ("readMeFilePath: $readMeFilePath") -Verbose + Write-Verbose ("repoRootPath: $repoRootPath") -Verbose # TODO Remove end # Get current hash @@ -670,7 +671,8 @@ Describe 'Readme tests' -Tag 'Readme' { . (Join-Path $repoRootPath 'utilities' 'tools' 'Set-ModuleReadMe.ps1') # Apply update with already compiled template content - Set-ModuleReadMe -TemplateFilePath $templateFilePath -TemplateFileContent $templateContent + Set-ModuleReadMe -TemplateFilePath $templateFilePath + # -TemplateFileContent $templateContent # Get hash after 'update' $fileHashAfter = (Get-FileHash $readMeFilePath).Hash From 5ebd6989b29a75940fed7adf87fe09fd406ff87e Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 18:01:40 +0200 Subject: [PATCH 30/63] readme utilities --- utilities/tools/Set-ModuleReadMe.ps1 | 10 +++++----- utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1 | 6 +++--- utilities/tools/platform/Set-ReadMeModuleTable.ps1 | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/utilities/tools/Set-ModuleReadMe.ps1 b/utilities/tools/Set-ModuleReadMe.ps1 index 2f380d351b..288ef90a2d 100644 --- a/utilities/tools/Set-ModuleReadMe.ps1 +++ b/utilities/tools/Set-ModuleReadMe.ps1 @@ -181,11 +181,11 @@ function Set-ParametersSection { # Check for local readme references if ($folderNames -and $parameter.name -in $folderNames -and $parameter.type -in @('object', 'array')) { if ($folderNames -contains $parameter.name) { - $type = '_[{0}]({0}/readme.md)_ {1}' -f ($folderNames | Where-Object { $_ -eq $parameter.name }), $parameter.type + $type = '_[{0}]({0}/README.md)_ {1}' -f ($folderNames | Where-Object { $_ -eq $parameter.name }), $parameter.type } } elseif ($folderNames -and $parameter.name -like '*Obj' -and $parameter.name.TrimEnd('Obj') -in $folderNames -and $parameter.type -in @('object', 'array')) { if ($folderNames -contains $parameter.name.TrimEnd('Obj')) { - $type = '_[{0}]({0}/readme.md)_ {1}' -f ($folderNames | Where-Object { $_ -eq $parameter.name.TrimEnd('Obj') }), $parameter.type + $type = '_[{0}]({0}/README.md)_ {1}' -f ($folderNames | Where-Object { $_ -eq $parameter.name.TrimEnd('Obj') }), $parameter.type } } else { $type = $parameter.type @@ -1383,7 +1383,7 @@ Optional. The template file content to process. If not provided, the template fi Using this property is useful if you already compiled the bicep template before invoking this function and want to avoid re-compiling it. .PARAMETER ReadMeFilePath -Optional. The path to the readme to update. If not provided assumes a 'readme.md' file in the same folder as the template +Optional. The path to the readme to update. If not provided assumes a 'README.md' file in the same folder as the template .PARAMETER SectionsToRefresh Optional. The sections to update. By default it refreshes all that are supported. @@ -1392,7 +1392,7 @@ Currently supports: 'Resource Types', 'Parameters', 'Outputs', 'Template referen .EXAMPLE Set-ModuleReadMe -TemplateFilePath 'C:\main.bicep' -Update the readme in path 'C:\readme.md' based on the bicep template in path 'C:\main.bicep' +Update the readme in path 'C:\README.md' based on the bicep template in path 'C:\main.bicep' .EXAMPLE Set-ModuleReadMe -TemplateFilePath 'C:/Microsoft.Network/loadBalancers/main.bicep' -SectionsToRefresh @('Parameters', 'Outputs') @@ -1431,7 +1431,7 @@ function Set-ModuleReadMe { [hashtable] $TemplateFileContent, [Parameter(Mandatory = $false)] - [string] $ReadMeFilePath = (Join-Path (Split-Path $TemplateFilePath -Parent) 'readme.md'), + [string] $ReadMeFilePath = (Join-Path (Split-Path $TemplateFilePath -Parent) 'README.md'), [Parameter(Mandatory = $false)] [ValidateSet( diff --git a/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1 b/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1 index 6861fb539d..aa7e2d2354 100644 --- a/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1 +++ b/utilities/tools/helper/Get-ModulesAsMarkdownTable.ps1 @@ -72,12 +72,12 @@ function Get-ResourceModuleName { [string] $Path ) - if (-not (Test-Path "$Path/readme.md")) { - Write-Warning "No [readme.md] found in folder [$Path]" + if (-not (Test-Path "$Path/README.md")) { + Write-Warning "No [README.md] found in folder [$Path]" return '' } - $moduleReadMeContent = Get-Content -Path "$Path/readme.md" + $moduleReadMeContent = Get-Content -Path "$Path/README.md" $moduleName = $moduleReadMeContent[0].TrimStart('# ').Split('`')[0].Trim() if (-not [String]::IsNullOrEmpty($moduleName)) { diff --git a/utilities/tools/platform/Set-ReadMeModuleTable.ps1 b/utilities/tools/platform/Set-ReadMeModuleTable.ps1 index 6210f26fae..f2968f085e 100644 --- a/utilities/tools/platform/Set-ReadMeModuleTable.ps1 +++ b/utilities/tools/platform/Set-ReadMeModuleTable.ps1 @@ -29,9 +29,9 @@ Mandatory. The set of columns to add to the table in the order you expect them i Available are 'Name', 'ProviderNamespace', 'ResourceType', 'TemplateType', 'Deploy' & 'Status' .EXAMPLE -Set-ReadMeModuleTable -FilePath 'C:\readme.md' -ModulesPath 'C:\modules' -RepositoryName 'ResourceModules' -Organization 'Azure' -ColumnsInOrder @('Name','Status') +Set-ReadMeModuleTable -FilePath 'C:\README.md' -ModulesPath 'C:\modules' -RepositoryName 'ResourceModules' -Organization 'Azure' -ColumnsInOrder @('Name','Status') -Update the defined table section in the 'readme.md' file with a table that has the columns 'Name' & 'Status' +Update the defined table section in the 'README.md' file with a table that has the columns 'Name' & 'Status' #> function Set-ReadMeModuleTable { From f043a60d4c86d5efbf18fecf9ea1161b231b5db0 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 18:07:19 +0200 Subject: [PATCH 31/63] readme docs --- docs/wiki/Contribution guide - Contribution flow.md | 2 +- docs/wiki/Solution creation.md | 4 ++-- docs/wiki/The library - Module design.md | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/wiki/Contribution guide - Contribution flow.md b/docs/wiki/Contribution guide - Contribution flow.md index 12179a84e9..411799867e 100644 --- a/docs/wiki/Contribution guide - Contribution flow.md +++ b/docs/wiki/Contribution guide - Contribution flow.md @@ -53,7 +53,7 @@ How you proceed from here, depends on your scenario: - In case your contribution involves changes to the library (the modules) and/or to the CI environment (the pipelines), we kindly ask you to first review the [Module design](./The%20library%20-%20Module%20design) and/or the [Pipeline design](./The%20CI%20environment%20-%20Pipeline%20design) sections respectively, to make sure your contribution complies with the repository's design and principles. - If your contribution involves the creation of a new module or an update to an existing module: - - Make sure you also reflect your changes in the module's `readme.md` file. Refer to the [Generate module Readme](./Contribution%20guide%20-%20Generate%20module%20Readme) section for details on how to leverage the Readme generator utility to support you with this task. + - Make sure you also reflect your changes in the module's `README.md` file. Refer to the [Generate module Readme](./Contribution%20guide%20-%20Generate%20module%20Readme) section for details on how to leverage the Readme generator utility to support you with this task. - If you are adding or updating role assignments to resources deployable by the module, refer to the [Get formatted RBAC roles](./Contribution%20guide%20-%20Get%20formatted%20RBAC%20roles) section for details on how to leverage the RBAC roles formatting utility to support you with this task. - If applicable, make sure you set or update the major and minor versions in the corresponding module `version.json` file. diff --git a/docs/wiki/Solution creation.md b/docs/wiki/Solution creation.md index 77d4808ec9..007a3440b9 100644 --- a/docs/wiki/Solution creation.md +++ b/docs/wiki/Solution creation.md @@ -140,8 +140,8 @@ Once you start building a solution using this library, you may wonder how best t - Use the [VS-Code extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-bicep) for Bicep to enable DSL-native features such as auto-complete. Metadata implemented in the modules are automatically loaded through the extension. - Use the readme - - If you don't know how to use an object/array parameter, you can check if the module's ReadMe file specifies any 'Parameter Usage' block for the given parameter ([example](https://github.com/Azure/ResourceModules/blob/main/modules/Microsoft.AnalysisServices/servers/readme.md#parameter-usage-tags)) - or - check the module's `Deployment Examples` ([example](https://github.com/Azure/ResourceModules/blob/main/modules/Microsoft.AnalysisServices/servers/readme.md#deployment-examples)). - - In general, take note of the `Deployment Examples` specified in each module's ReadMe file, as they provide you with rich & tested examples of how a given module can be deployed ([example](https://github.com/Azure/ResourceModules/blob/main/modules/Microsoft.AnalysisServices/servers/readme.md#deployment-examples)). An easy way to get started is to copy one of the examples and then adjust it to your needs. + - If you don't know how to use an object/array parameter, you can check if the module's ReadMe file specifies any 'Parameter Usage' block for the given parameter ([example](https://github.com/Azure/ResourceModules/blob/main/modules/Microsoft.AnalysisServices/servers/README.md#parameter-usage-tags)) - or - check the module's `Deployment Examples` ([example](https://github.com/Azure/ResourceModules/blob/main/modules/Microsoft.AnalysisServices/servers/README.md#deployment-examples)). + - In general, take note of the `Deployment Examples` specified in each module's ReadMe file, as they provide you with rich & tested examples of how a given module can be deployed ([example](https://github.com/Azure/ResourceModules/blob/main/modules/Microsoft.AnalysisServices/servers/README.md#deployment-examples)). An easy way to get started is to copy one of the examples and then adjust it to your needs. - Note the outputs that are returned by each module. - If an output you need isn't available, you have 2 choices: 1. Add the missing output to the module diff --git a/docs/wiki/The library - Module design.md b/docs/wiki/The library - Module design.md index 68a267fe00..923643924f 100644 --- a/docs/wiki/The library - Module design.md +++ b/docs/wiki/The library - Module design.md @@ -34,7 +34,7 @@ This section details the design principles followed by the CARML Bicep modules. --- -Modules are written in a flexible way; therefore, you don't need to modify them from project to project, use case to use case, as they aim to cover most of the functionality that a given resource type can provide, in a way that you can interact with any module just by sending the required parameters to it - i.e., you don't have to know how the template of the particular module works inside, just take a look at the `readme.md` file of the given module to consume it. +Modules are written in a flexible way; therefore, you don't need to modify them from project to project, use case to use case, as they aim to cover most of the functionality that a given resource type can provide, in a way that you can interact with any module just by sending the required parameters to it - i.e., you don't have to know how the template of the particular module works inside, just take a look at the `README.md` file of the given module to consume it. The modules are multi-purpose; therefore, contain a lot of dynamic expressions (functions, variables, etc.), so there's no need to maintain multiple instances for different use cases. @@ -65,7 +65,7 @@ A **CARML module** consists of - The Bicep template deployment file (`main.bicep`). - One or multiple module test files (`main.test.bicep`) that will be used for testing, located in the `.test` folder and its subfolders. -- A `readme.md` file which describes the module itself. +- A `README.md` file which describes the module itself. - A `version.json` file which contains information on the module's major and minor version. A module usually represents a single resource or a set of closely related resources. For example, a storage account and the associated lock or virtual machine and network interfaces. Modules are located in the `modules` folder. @@ -118,7 +118,7 @@ Use the following naming standard for module files and folders: ├─ .test | └─ ... ├─ main.bicep - └─ readme.md + └─ README.md ``` > **Example**: `nested_roleAssignments.bicep` in the `Microsoft.Web\sites\.bicep` folder contains the `site` resource RBAC implementation. @@ -131,7 +131,7 @@ Use the following naming standard for module files and folders: > ├─ .test > | └─ ... > ├─ main.bicep - > └─ readme.md + > └─ README.md > ``` ## Patterns @@ -557,7 +557,7 @@ Its primary components are in order: Note the following recommendations: - Refer to [Generate module Readme](./Contribution%20guide%20-%20Generate%20module%20Readme) for creating from scratch or updating the module ReadMe Markdown file. -- It is not recommended to describe how to use child resources in the parent readme file (for example, 'How to define a \[container] entry for the \[storage account]'). Instead, it is recommended to reference the child resource's ReadMe (for example, 'container/readme.md'). +- It is not recommended to describe how to use child resources in the parent readme file (for example, 'How to define a \[container] entry for the \[storage account]'). Instead, it is recommended to reference the child resource's ReadMe (for example, 'container/README.md'). # Module test files From 96ba317ee3f7d58e54f41feaaac351dd57d4fb0e Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 18:10:05 +0200 Subject: [PATCH 32/63] update avd readme --- modules/DesktopVirtualization/applicationGroups/README.md | 2 +- modules/DesktopVirtualization/hostPools/README.md | 4 ++-- modules/DesktopVirtualization/scalingPlans/README.md | 4 ++-- modules/DesktopVirtualization/workspaces/README.md | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/DesktopVirtualization/applicationGroups/README.md b/modules/DesktopVirtualization/applicationGroups/README.md index ad530ac04f..bb77c5a3fa 100644 --- a/modules/DesktopVirtualization/applicationGroups/README.md +++ b/modules/DesktopVirtualization/applicationGroups/README.md @@ -34,7 +34,7 @@ This module deploys an Azure virtual desktop application group. | Parameter Name | Type | Default Value | Allowed Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `applications` | _[applications](applications/readme.md)_ array | `[]` | | List of applications to be created in the Application Group. | +| `applications` | _[applications](applications/README.md)_ array | `[]` | | List of applications to be created in the Application Group. | | `description` | string | `''` | | The description of the Application Group to be created. | | `diagnosticEventHubAuthorizationRuleId` | string | `''` | | Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | `''` | | Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | diff --git a/modules/DesktopVirtualization/hostPools/README.md b/modules/DesktopVirtualization/hostPools/README.md index b7d42ce5a0..29e6c2ace3 100644 --- a/modules/DesktopVirtualization/hostPools/README.md +++ b/modules/DesktopVirtualization/hostPools/README.md @@ -281,7 +281,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module hostpools './Microsoft.DesktopVirtualization/hostpools/main.bicep' = { +module hostPools './DesktopVirtualization/hostPools/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dvhpcom' params: { // Required parameters @@ -480,7 +480,7 @@ module hostpools './Microsoft.DesktopVirtualization/hostpools/main.bicep' = { via Bicep module ```bicep -module hostpools './Microsoft.DesktopVirtualization/hostpools/main.bicep' = { +module hostPools './DesktopVirtualization/hostPools/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dvhpmin' params: { // Required parameters diff --git a/modules/DesktopVirtualization/scalingPlans/README.md b/modules/DesktopVirtualization/scalingPlans/README.md index a87db21e19..706c814d8f 100644 --- a/modules/DesktopVirtualization/scalingPlans/README.md +++ b/modules/DesktopVirtualization/scalingPlans/README.md @@ -277,7 +277,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module scalingplans './Microsoft.DesktopVirtualization/scalingplans/main.bicep' = { +module scalingPlans './DesktopVirtualization/scalingPlans/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dvspcom' params: { // Required parameters @@ -384,7 +384,7 @@ module scalingplans './Microsoft.DesktopVirtualization/scalingplans/main.bicep' via Bicep module ```bicep -module scalingplans './Microsoft.DesktopVirtualization/scalingplans/main.bicep' = { +module scalingPlans './DesktopVirtualization/scalingPlans/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dvspmin' params: { // Required parameters diff --git a/modules/DesktopVirtualization/workspaces/README.md b/modules/DesktopVirtualization/workspaces/README.md index afecc24e07..ec9bcee536 100644 --- a/modules/DesktopVirtualization/workspaces/README.md +++ b/modules/DesktopVirtualization/workspaces/README.md @@ -175,7 +175,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module workspaces './Microsoft.DesktopVirtualization/workspaces/main.bicep' = { +module workspaces './DesktopVirtualization/workspaces/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dvwcom' params: { // Required parameters @@ -294,7 +294,7 @@ module workspaces './Microsoft.DesktopVirtualization/workspaces/main.bicep' = { via Bicep module ```bicep -module workspaces './Microsoft.DesktopVirtualization/workspaces/main.bicep' = { +module workspaces './DesktopVirtualization/workspaces/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dvwmin' params: { // Required parameters From bee8fe74dd1ba7a9809a76a9479e00a38919da20 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 18:17:46 +0200 Subject: [PATCH 33/63] storage module --- .../storageAccounts/.bicep/nested_roleAssignments.bicep | 0 .../storageAccounts/.test/common/dependencies.bicep | 0 .../storageAccounts/.test/common/main.test.bicep | 0 .../storageAccounts/.test/encr/dependencies.bicep | 0 .../storageAccounts/.test/encr/main.test.bicep | 0 .../storageAccounts/.test/min/main.test.bicep | 0 .../storageAccounts/.test/nfs/dependencies.bicep | 0 .../storageAccounts/.test/nfs/main.test.bicep | 0 .../storageAccounts/.test/v1/main.test.bicep | 0 .../readme.md => Storage/storageAccounts/README.md} | 0 .../readme.md => Storage/storageAccounts/blobServices/README.md} | 0 .../blobServices/containers/.bicep/nested_roleAssignments.bicep | 0 .../storageAccounts/blobServices/containers/README.md} | 0 .../blobServices/containers/immutabilityPolicies/README.md} | 0 .../blobServices/containers/immutabilityPolicies/main.bicep | 0 .../blobServices/containers/immutabilityPolicies/version.json | 0 .../storageAccounts/blobServices/containers/main.bicep | 0 .../storageAccounts/blobServices/containers/version.json | 0 .../storageAccounts/blobServices/main.bicep | 0 .../storageAccounts/blobServices/version.json | 0 .../readme.md => Storage/storageAccounts/fileServices/README.md} | 0 .../storageAccounts/fileServices/main.bicep | 0 .../fileServices/shares/.bicep/nested_roleAssignments.bicep | 0 .../storageAccounts/fileServices/shares/README.md} | 0 .../storageAccounts/fileServices/shares/main.bicep | 0 .../storageAccounts/fileServices/shares/version.json | 0 .../storageAccounts/fileServices/version.json | 0 .../readme.md => Storage/storageAccounts/localUsers/README.md} | 0 .../storageAccounts/localUsers/main.bicep | 0 .../storageAccounts/localUsers/version.json | 0 modules/{Microsoft.Storage => Storage}/storageAccounts/main.bicep | 0 .../storageAccounts/managementPolicies/README.md} | 0 .../storageAccounts/managementPolicies/main.bicep | 0 .../storageAccounts/managementPolicies/version.json | 0 .../readme.md => Storage/storageAccounts/queueServices/README.md} | 0 .../storageAccounts/queueServices/main.bicep | 0 .../queueServices/queues/.bicep/nested_roleAssignments.bicep | 0 .../storageAccounts/queueServices/queues/README.md} | 0 .../storageAccounts/queueServices/queues/main.bicep | 0 .../storageAccounts/queueServices/queues/version.json | 0 .../storageAccounts/queueServices/version.json | 0 .../readme.md => Storage/storageAccounts/tableServices/README.md} | 0 .../storageAccounts/tableServices/main.bicep | 0 .../storageAccounts/tableServices/tables/README.md} | 0 .../storageAccounts/tableServices/tables/main.bicep | 0 .../storageAccounts/tableServices/tables/version.json | 0 .../storageAccounts/tableServices/version.json | 0 .../{Microsoft.Storage => Storage}/storageAccounts/version.json | 0 48 files changed, 0 insertions(+), 0 deletions(-) rename modules/{Microsoft.Storage => Storage}/storageAccounts/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/.test/encr/dependencies.bicep (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/.test/encr/main.test.bicep (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/.test/nfs/dependencies.bicep (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/.test/nfs/main.test.bicep (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/.test/v1/main.test.bicep (100%) rename modules/{Microsoft.Storage/storageAccounts/readme.md => Storage/storageAccounts/README.md} (100%) rename modules/{Microsoft.Storage/storageAccounts/blobServices/readme.md => Storage/storageAccounts/blobServices/README.md} (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/blobServices/containers/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Storage/storageAccounts/blobServices/containers/readme.md => Storage/storageAccounts/blobServices/containers/README.md} (100%) rename modules/{Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/readme.md => Storage/storageAccounts/blobServices/containers/immutabilityPolicies/README.md} (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/blobServices/containers/immutabilityPolicies/main.bicep (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/blobServices/containers/immutabilityPolicies/version.json (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/blobServices/containers/main.bicep (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/blobServices/containers/version.json (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/blobServices/main.bicep (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/blobServices/version.json (100%) rename modules/{Microsoft.Storage/storageAccounts/fileServices/readme.md => Storage/storageAccounts/fileServices/README.md} (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/fileServices/main.bicep (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/fileServices/shares/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Storage/storageAccounts/fileServices/shares/readme.md => Storage/storageAccounts/fileServices/shares/README.md} (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/fileServices/shares/main.bicep (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/fileServices/shares/version.json (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/fileServices/version.json (100%) rename modules/{Microsoft.Storage/storageAccounts/localUsers/readme.md => Storage/storageAccounts/localUsers/README.md} (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/localUsers/main.bicep (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/localUsers/version.json (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/main.bicep (100%) rename modules/{Microsoft.Storage/storageAccounts/managementPolicies/readme.md => Storage/storageAccounts/managementPolicies/README.md} (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/managementPolicies/main.bicep (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/managementPolicies/version.json (100%) rename modules/{Microsoft.Storage/storageAccounts/queueServices/readme.md => Storage/storageAccounts/queueServices/README.md} (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/queueServices/main.bicep (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/queueServices/queues/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Storage/storageAccounts/queueServices/queues/readme.md => Storage/storageAccounts/queueServices/queues/README.md} (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/queueServices/queues/main.bicep (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/queueServices/queues/version.json (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/queueServices/version.json (100%) rename modules/{Microsoft.Storage/storageAccounts/tableServices/readme.md => Storage/storageAccounts/tableServices/README.md} (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/tableServices/main.bicep (100%) rename modules/{Microsoft.Storage/storageAccounts/tableServices/tables/readme.md => Storage/storageAccounts/tableServices/tables/README.md} (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/tableServices/tables/main.bicep (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/tableServices/tables/version.json (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/tableServices/version.json (100%) rename modules/{Microsoft.Storage => Storage}/storageAccounts/version.json (100%) diff --git a/modules/Microsoft.Storage/storageAccounts/.bicep/nested_roleAssignments.bicep b/modules/Storage/storageAccounts/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/.bicep/nested_roleAssignments.bicep rename to modules/Storage/storageAccounts/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/.test/common/dependencies.bicep b/modules/Storage/storageAccounts/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/.test/common/dependencies.bicep rename to modules/Storage/storageAccounts/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/.test/common/main.test.bicep b/modules/Storage/storageAccounts/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/.test/common/main.test.bicep rename to modules/Storage/storageAccounts/.test/common/main.test.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/.test/encr/dependencies.bicep b/modules/Storage/storageAccounts/.test/encr/dependencies.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/.test/encr/dependencies.bicep rename to modules/Storage/storageAccounts/.test/encr/dependencies.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/.test/encr/main.test.bicep b/modules/Storage/storageAccounts/.test/encr/main.test.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/.test/encr/main.test.bicep rename to modules/Storage/storageAccounts/.test/encr/main.test.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/.test/min/main.test.bicep b/modules/Storage/storageAccounts/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/.test/min/main.test.bicep rename to modules/Storage/storageAccounts/.test/min/main.test.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/.test/nfs/dependencies.bicep b/modules/Storage/storageAccounts/.test/nfs/dependencies.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/.test/nfs/dependencies.bicep rename to modules/Storage/storageAccounts/.test/nfs/dependencies.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/.test/nfs/main.test.bicep b/modules/Storage/storageAccounts/.test/nfs/main.test.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/.test/nfs/main.test.bicep rename to modules/Storage/storageAccounts/.test/nfs/main.test.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/.test/v1/main.test.bicep b/modules/Storage/storageAccounts/.test/v1/main.test.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/.test/v1/main.test.bicep rename to modules/Storage/storageAccounts/.test/v1/main.test.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/readme.md b/modules/Storage/storageAccounts/README.md similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/readme.md rename to modules/Storage/storageAccounts/README.md diff --git a/modules/Microsoft.Storage/storageAccounts/blobServices/readme.md b/modules/Storage/storageAccounts/blobServices/README.md similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/blobServices/readme.md rename to modules/Storage/storageAccounts/blobServices/README.md diff --git a/modules/Microsoft.Storage/storageAccounts/blobServices/containers/.bicep/nested_roleAssignments.bicep b/modules/Storage/storageAccounts/blobServices/containers/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/blobServices/containers/.bicep/nested_roleAssignments.bicep rename to modules/Storage/storageAccounts/blobServices/containers/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/blobServices/containers/readme.md b/modules/Storage/storageAccounts/blobServices/containers/README.md similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/blobServices/containers/readme.md rename to modules/Storage/storageAccounts/blobServices/containers/README.md diff --git a/modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/readme.md b/modules/Storage/storageAccounts/blobServices/containers/immutabilityPolicies/README.md similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/readme.md rename to modules/Storage/storageAccounts/blobServices/containers/immutabilityPolicies/README.md diff --git a/modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/main.bicep b/modules/Storage/storageAccounts/blobServices/containers/immutabilityPolicies/main.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/main.bicep rename to modules/Storage/storageAccounts/blobServices/containers/immutabilityPolicies/main.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json b/modules/Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json rename to modules/Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json diff --git a/modules/Microsoft.Storage/storageAccounts/blobServices/containers/main.bicep b/modules/Storage/storageAccounts/blobServices/containers/main.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/blobServices/containers/main.bicep rename to modules/Storage/storageAccounts/blobServices/containers/main.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/blobServices/containers/version.json b/modules/Storage/storageAccounts/blobServices/containers/version.json similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/blobServices/containers/version.json rename to modules/Storage/storageAccounts/blobServices/containers/version.json diff --git a/modules/Microsoft.Storage/storageAccounts/blobServices/main.bicep b/modules/Storage/storageAccounts/blobServices/main.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/blobServices/main.bicep rename to modules/Storage/storageAccounts/blobServices/main.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/blobServices/version.json b/modules/Storage/storageAccounts/blobServices/version.json similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/blobServices/version.json rename to modules/Storage/storageAccounts/blobServices/version.json diff --git a/modules/Microsoft.Storage/storageAccounts/fileServices/readme.md b/modules/Storage/storageAccounts/fileServices/README.md similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/fileServices/readme.md rename to modules/Storage/storageAccounts/fileServices/README.md diff --git a/modules/Microsoft.Storage/storageAccounts/fileServices/main.bicep b/modules/Storage/storageAccounts/fileServices/main.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/fileServices/main.bicep rename to modules/Storage/storageAccounts/fileServices/main.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/fileServices/shares/.bicep/nested_roleAssignments.bicep b/modules/Storage/storageAccounts/fileServices/shares/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/fileServices/shares/.bicep/nested_roleAssignments.bicep rename to modules/Storage/storageAccounts/fileServices/shares/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/fileServices/shares/readme.md b/modules/Storage/storageAccounts/fileServices/shares/README.md similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/fileServices/shares/readme.md rename to modules/Storage/storageAccounts/fileServices/shares/README.md diff --git a/modules/Microsoft.Storage/storageAccounts/fileServices/shares/main.bicep b/modules/Storage/storageAccounts/fileServices/shares/main.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/fileServices/shares/main.bicep rename to modules/Storage/storageAccounts/fileServices/shares/main.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/fileServices/shares/version.json b/modules/Storage/storageAccounts/fileServices/shares/version.json similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/fileServices/shares/version.json rename to modules/Storage/storageAccounts/fileServices/shares/version.json diff --git a/modules/Microsoft.Storage/storageAccounts/fileServices/version.json b/modules/Storage/storageAccounts/fileServices/version.json similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/fileServices/version.json rename to modules/Storage/storageAccounts/fileServices/version.json diff --git a/modules/Microsoft.Storage/storageAccounts/localUsers/readme.md b/modules/Storage/storageAccounts/localUsers/README.md similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/localUsers/readme.md rename to modules/Storage/storageAccounts/localUsers/README.md diff --git a/modules/Microsoft.Storage/storageAccounts/localUsers/main.bicep b/modules/Storage/storageAccounts/localUsers/main.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/localUsers/main.bicep rename to modules/Storage/storageAccounts/localUsers/main.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/localUsers/version.json b/modules/Storage/storageAccounts/localUsers/version.json similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/localUsers/version.json rename to modules/Storage/storageAccounts/localUsers/version.json diff --git a/modules/Microsoft.Storage/storageAccounts/main.bicep b/modules/Storage/storageAccounts/main.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/main.bicep rename to modules/Storage/storageAccounts/main.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/managementPolicies/readme.md b/modules/Storage/storageAccounts/managementPolicies/README.md similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/managementPolicies/readme.md rename to modules/Storage/storageAccounts/managementPolicies/README.md diff --git a/modules/Microsoft.Storage/storageAccounts/managementPolicies/main.bicep b/modules/Storage/storageAccounts/managementPolicies/main.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/managementPolicies/main.bicep rename to modules/Storage/storageAccounts/managementPolicies/main.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/managementPolicies/version.json b/modules/Storage/storageAccounts/managementPolicies/version.json similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/managementPolicies/version.json rename to modules/Storage/storageAccounts/managementPolicies/version.json diff --git a/modules/Microsoft.Storage/storageAccounts/queueServices/readme.md b/modules/Storage/storageAccounts/queueServices/README.md similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/queueServices/readme.md rename to modules/Storage/storageAccounts/queueServices/README.md diff --git a/modules/Microsoft.Storage/storageAccounts/queueServices/main.bicep b/modules/Storage/storageAccounts/queueServices/main.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/queueServices/main.bicep rename to modules/Storage/storageAccounts/queueServices/main.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/queueServices/queues/.bicep/nested_roleAssignments.bicep b/modules/Storage/storageAccounts/queueServices/queues/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/queueServices/queues/.bicep/nested_roleAssignments.bicep rename to modules/Storage/storageAccounts/queueServices/queues/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/queueServices/queues/readme.md b/modules/Storage/storageAccounts/queueServices/queues/README.md similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/queueServices/queues/readme.md rename to modules/Storage/storageAccounts/queueServices/queues/README.md diff --git a/modules/Microsoft.Storage/storageAccounts/queueServices/queues/main.bicep b/modules/Storage/storageAccounts/queueServices/queues/main.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/queueServices/queues/main.bicep rename to modules/Storage/storageAccounts/queueServices/queues/main.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/queueServices/queues/version.json b/modules/Storage/storageAccounts/queueServices/queues/version.json similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/queueServices/queues/version.json rename to modules/Storage/storageAccounts/queueServices/queues/version.json diff --git a/modules/Microsoft.Storage/storageAccounts/queueServices/version.json b/modules/Storage/storageAccounts/queueServices/version.json similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/queueServices/version.json rename to modules/Storage/storageAccounts/queueServices/version.json diff --git a/modules/Microsoft.Storage/storageAccounts/tableServices/readme.md b/modules/Storage/storageAccounts/tableServices/README.md similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/tableServices/readme.md rename to modules/Storage/storageAccounts/tableServices/README.md diff --git a/modules/Microsoft.Storage/storageAccounts/tableServices/main.bicep b/modules/Storage/storageAccounts/tableServices/main.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/tableServices/main.bicep rename to modules/Storage/storageAccounts/tableServices/main.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/tableServices/tables/readme.md b/modules/Storage/storageAccounts/tableServices/tables/README.md similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/tableServices/tables/readme.md rename to modules/Storage/storageAccounts/tableServices/tables/README.md diff --git a/modules/Microsoft.Storage/storageAccounts/tableServices/tables/main.bicep b/modules/Storage/storageAccounts/tableServices/tables/main.bicep similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/tableServices/tables/main.bicep rename to modules/Storage/storageAccounts/tableServices/tables/main.bicep diff --git a/modules/Microsoft.Storage/storageAccounts/tableServices/tables/version.json b/modules/Storage/storageAccounts/tableServices/tables/version.json similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/tableServices/tables/version.json rename to modules/Storage/storageAccounts/tableServices/tables/version.json diff --git a/modules/Microsoft.Storage/storageAccounts/tableServices/version.json b/modules/Storage/storageAccounts/tableServices/version.json similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/tableServices/version.json rename to modules/Storage/storageAccounts/tableServices/version.json diff --git a/modules/Microsoft.Storage/storageAccounts/version.json b/modules/Storage/storageAccounts/version.json similarity index 100% rename from modules/Microsoft.Storage/storageAccounts/version.json rename to modules/Storage/storageAccounts/version.json From 327729d341f95176dfdc31185dcaa68a086c31db Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 18:21:07 +0200 Subject: [PATCH 34/63] storage workflow --- .github/workflows/ms.storage.storageaccounts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ms.storage.storageaccounts.yml b/.github/workflows/ms.storage.storageaccounts.yml index 7fad4fa9d6..202bed2edc 100644 --- a/.github/workflows/ms.storage.storageaccounts.yml +++ b/.github/workflows/ms.storage.storageaccounts.yml @@ -27,7 +27,7 @@ on: branches: - main paths: - - 'modules/Microsoft.Storage/storageAccounts/**' + - 'modules/Storage/storageAccounts/**' - 'modules/Microsoft.Network/privateEndpoints/**' - '.github/actions/templates/**' - '.github/workflows/template.module.yml' @@ -37,7 +37,7 @@ on: - '!*/**/readme.md' env: - modulePath: 'modules/Microsoft.Storage/storageAccounts' + modulePath: 'modules/Storage/storageAccounts' workflowPath: '.github/workflows/ms.storage.storageaccounts.yml' concurrency: From c6656c8af89b957139f6dade4183c06677d177a2 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 18:27:10 +0200 Subject: [PATCH 35/63] network module --- .../.test/common/main.test.bicep | 0 .../README.md} | 0 .../main.bicep | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../applicationGateways/README.md} | 0 .../applicationGateways/main.bicep | 0 .../applicationGateways/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../applicationSecurityGroups/README.md} | 0 .../applicationSecurityGroups/main.bicep | 0 .../applicationSecurityGroups/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/addpip/dependencies.bicep | 0 .../.test/addpip/main.test.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/custompip/dependencies.bicep | 0 .../.test/custompip/main.test.bicep | 0 .../.test/hubcommon/dependencies.bicep | 0 .../.test/hubcommon/main.test.bicep | 0 .../.test/hubmin/dependencies.bicep | 0 .../.test/hubmin/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../azureFirewalls/.test/min/main.test.bicep | 0 .../azureFirewalls/README.md} | 0 .../azureFirewalls/main.bicep | 0 .../azureFirewalls/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../bastionHosts/.test/common/main.test.bicep | 0 .../.test/custompip/dependencies.bicep | 0 .../.test/custompip/main.test.bicep | 0 .../bastionHosts/.test/min/dependencies.bicep | 0 .../bastionHosts/.test/min/main.test.bicep | 0 .../bastionHosts/README.md} | 0 .../bastionHosts/main.bicep | 0 .../bastionHosts/version.json | 0 .../.test/vnet2vnet/dependencies.bicep | 0 .../.test/vnet2vnet/main.test.bicep | 0 .../connections/README.md} | 0 .../connections/main.bicep | 0 .../connections/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../ddosProtectionPlans/README.md} | 0 .../ddosProtectionPlans/main.bicep | 0 .../ddosProtectionPlans/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../dnsResolvers/.test/common/main.test.bicep | 0 .../dnsResolvers/README.md} | 0 .../dnsResolvers/main.bicep | 0 .../dnsResolvers/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../dnsZones/.test/common/dependencies.bicep | 0 .../dnsZones/.test/common/main.test.bicep | 0 .../dnsZones/.test/min/main.test.bicep | 0 .../A/.bicep/nested_roleAssignments.bicep | 0 .../dnsZones/A/README.md} | 0 .../dnsZones/A/main.bicep | 0 .../dnsZones/A/version.json | 0 .../AAAA/.bicep/nested_roleAssignments.bicep | 0 .../dnsZones/AAAA/README.md} | 0 .../dnsZones/AAAA/main.bicep | 0 .../dnsZones/AAAA/version.json | 0 .../CAA/.bicep/nested_roleAssignments.bicep | 0 .../dnsZones/CAA/README.md} | 0 .../dnsZones/CAA/main.bicep | 0 .../dnsZones/CAA/version.json | 0 .../CNAME/.bicep/nested_roleAssignments.bicep | 0 .../dnsZones/CNAME/README.md} | 0 .../dnsZones/CNAME/main.bicep | 0 .../dnsZones/CNAME/version.json | 0 .../MX/.bicep/nested_roleAssignments.bicep | 0 .../dnsZones/MX/README.md} | 0 .../dnsZones/MX/main.bicep | 0 .../dnsZones/MX/version.json | 0 .../NS/.bicep/nested_roleAssignments.bicep | 0 .../dnsZones/NS/README.md} | 0 .../dnsZones/NS/main.bicep | 0 .../dnsZones/NS/version.json | 0 .../PTR/.bicep/nested_roleAssignments.bicep | 0 .../dnsZones/PTR/README.md} | 0 .../dnsZones/PTR/main.bicep | 0 .../dnsZones/PTR/version.json | 0 .../readme.md => Network/dnsZones/README.md} | 0 .../SOA/.bicep/nested_roleAssignments.bicep | 0 .../dnsZones/SOA/README.md} | 0 .../dnsZones/SOA/main.bicep | 0 .../dnsZones/SOA/version.json | 0 .../SRV/.bicep/nested_roleAssignments.bicep | 0 .../dnsZones/SRV/README.md} | 0 .../dnsZones/SRV/main.bicep | 0 .../dnsZones/SRV/version.json | 0 .../TXT/.bicep/nested_roleAssignments.bicep | 0 .../dnsZones/TXT/README.md} | 0 .../dnsZones/TXT/main.bicep | 0 .../dnsZones/TXT/version.json | 0 .../dnsZones/main.bicep | 0 .../dnsZones/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../expressRouteCircuits/README.md} | 0 .../expressRouteCircuits/main.bicep | 0 .../expressRouteCircuits/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../expressRouteGateway/README.md} | 0 .../expressRouteGateway/main.bicep | 0 .../expressRouteGateway/version.json | 0 .../.test/common/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../firewallPolicies/README.md} | 0 .../firewallPolicies/main.bicep | 0 .../ruleCollectionGroups/README.md} | 0 .../ruleCollectionGroups/main.bicep | 0 .../ruleCollectionGroups/version.json | 0 .../firewallPolicies/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../frontDoors/.test/common/main.test.bicep | 0 .../frontDoors/.test/min/main.test.bicep | 0 .../frontDoors/README.md} | 0 .../frontDoors/main.bicep | 0 .../frontDoors/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../ipGroups/.test/common/dependencies.bicep | 0 .../ipGroups/.test/common/main.test.bicep | 0 .../ipGroups/.test/min/main.test.bicep | 0 .../readme.md => Network/ipGroups/README.md} | 0 .../ipGroups/main.bicep | 0 .../ipGroups/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/internal/dependencies.bicep | 0 .../.test/internal/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../loadBalancers/.test/min/main.test.bicep | 0 .../loadBalancers/README.md} | 0 .../backendAddressPools/README.md} | 0 .../backendAddressPools/main.bicep | 0 .../backendAddressPools/version.json | 0 .../loadBalancers/inboundNatRules/README.md} | 0 .../loadBalancers/inboundNatRules/main.bicep | 0 .../inboundNatRules/version.json | 0 .../loadBalancers/main.bicep | 0 .../loadBalancers/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../localNetworkGateways/README.md} | 0 .../localNetworkGateways/main.bicep | 0 .../localNetworkGateways/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../natGateways/.test/common/main.test.bicep | 0 .../natGateways/README.md} | 0 .../natGateways/main.bicep | 0 .../natGateways/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../networkInterfaces/README.md} | 0 .../networkInterfaces/main.bicep | 0 .../networkInterfaces/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../networkManagers/README.md} | 0 .../connectivityConfigurations/README.md} | 0 .../connectivityConfigurations/main.bicep | 0 .../connectivityConfigurations/version.json | 0 .../networkManagers/main.bicep | 0 .../networkManagers/networkGroups/README.md} | 0 .../networkManagers/networkGroups/main.bicep | 0 .../networkGroups/staticMembers/README.md} | 0 .../networkGroups/staticMembers/main.bicep | 0 .../networkGroups/staticMembers/version.json | 0 .../networkGroups/version.json | 0 .../scopeConnections/README.md} | 0 .../scopeConnections/main.bicep | 0 .../scopeConnections/version.json | 0 .../securityAdminConfigurations/README.md} | 0 .../securityAdminConfigurations/main.bicep | 0 .../ruleCollections/README.md} | 0 .../ruleCollections/main.bicep | 0 .../ruleCollections/rules/README.md} | 0 .../ruleCollections/rules/main.bicep | 0 .../ruleCollections/rules/version.json | 0 .../ruleCollections/version.json | 0 .../securityAdminConfigurations/version.json | 0 .../networkManagers/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../networkSecurityGroups/README.md} | 0 .../networkSecurityGroups/main.bicep | 0 .../securityRules/README.md} | 0 .../securityRules/main.bicep | 0 .../securityRules/version.json | 0 .../networkSecurityGroups/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../networkWatchers/.test/min/main.test.bicep | 0 .../networkWatchers/README.md} | 0 .../connectionMonitors/README.md} | 0 .../connectionMonitors/main.bicep | 0 .../connectionMonitors/version.json | 0 .../networkWatchers/flowLogs/README.md} | 0 .../networkWatchers/flowLogs/main.bicep | 0 .../networkWatchers/flowLogs/version.json | 0 .../networkWatchers/main.bicep | 0 .../networkWatchers/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../privateDnsZones/.test/min/main.test.bicep | 0 .../A/.bicep/nested_roleAssignments.bicep | 0 .../privateDnsZones/A/README.md} | 0 .../privateDnsZones/A/main.bicep | 0 .../privateDnsZones/A/version.json | 0 .../AAAA/.bicep/nested_roleAssignments.bicep | 0 .../privateDnsZones/AAAA/README.md} | 0 .../privateDnsZones/AAAA/main.bicep | 0 .../privateDnsZones/AAAA/version.json | 0 .../CNAME/.bicep/nested_roleAssignments.bicep | 0 .../privateDnsZones/CNAME/README.md} | 0 .../privateDnsZones/CNAME/main.bicep | 0 .../privateDnsZones/CNAME/version.json | 0 .../MX/.bicep/nested_roleAssignments.bicep | 0 .../privateDnsZones/MX/README.md} | 0 .../privateDnsZones/MX/main.bicep | 0 .../privateDnsZones/MX/version.json | 0 .../PTR/.bicep/nested_roleAssignments.bicep | 0 .../privateDnsZones/PTR/README.md} | 0 .../privateDnsZones/PTR/main.bicep | 0 .../privateDnsZones/PTR/version.json | 0 .../privateDnsZones/README.md} | 0 .../SOA/.bicep/nested_roleAssignments.bicep | 0 .../privateDnsZones/SOA/README.md} | 0 .../privateDnsZones/SOA/main.bicep | 0 .../privateDnsZones/SOA/version.json | 0 .../SRV/.bicep/nested_roleAssignments.bicep | 0 .../privateDnsZones/SRV/README.md} | 0 .../privateDnsZones/SRV/main.bicep | 0 .../privateDnsZones/SRV/version.json | 0 .../TXT/.bicep/nested_roleAssignments.bicep | 0 .../privateDnsZones/TXT/README.md} | 0 .../privateDnsZones/TXT/main.bicep | 0 .../privateDnsZones/TXT/version.json | 0 .../privateDnsZones/main.bicep | 0 .../privateDnsZones/version.json | 0 .../virtualNetworkLinks/README.md} | 0 .../virtualNetworkLinks/main.bicep | 0 .../virtualNetworkLinks/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../privateEndpoints/README.md} | 0 .../privateEndpoints/main.bicep | 0 .../privateDnsZoneGroups/README.md} | 0 .../privateDnsZoneGroups/main.bicep | 0 .../privateDnsZoneGroups/version.json | 0 .../privateEndpoints/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../privateLinkServices/README.md} | 0 .../privateLinkServices/main.bicep | 0 .../privateLinkServices/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../publicIPAddresses/README.md} | 0 .../publicIPAddresses/main.bicep | 0 .../publicIPAddresses/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../publicIPPrefixes/README.md} | 0 .../publicIPPrefixes/main.bicep | 0 .../publicIPPrefixes/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../routeTables/.test/common/main.test.bicep | 0 .../routeTables/.test/min/main.test.bicep | 0 .../routeTables/README.md} | 0 .../routeTables/main.bicep | 0 .../routeTables/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../trafficmanagerprofiles/README.md} | 0 .../trafficmanagerprofiles/main.bicep | 0 .../trafficmanagerprofiles/version.json | 0 .../.test/common/dependencies.bicep | 0 .../virtualHubs/.test/common/main.test.bicep | 0 .../virtualHubs/.test/min/dependencies.bicep | 0 .../virtualHubs/.test/min/main.test.bicep | 0 .../virtualHubs/README.md} | 0 .../virtualHubs/hubRouteTables/README.md} | 0 .../virtualHubs/hubRouteTables/main.bicep | 0 .../virtualHubs/hubRouteTables/version.json | 0 .../hubVirtualNetworkConnections/README.md} | 0 .../hubVirtualNetworkConnections/main.bicep | 0 .../hubVirtualNetworkConnections/version.json | 0 .../virtualHubs/main.bicep | 0 .../virtualHubs/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/aadvpn/dependencies.bicep | 0 .../.test/aadvpn/main.test.bicep | 0 .../.test/expressRoute/dependencies.bicep | 0 .../.test/expressRoute/main.test.bicep | 0 .../.test/vpn/dependencies.bicep | 0 .../.test/vpn/main.test.bicep | 0 .../virtualNetworkGateways/README.md} | 0 .../virtualNetworkGateways/main.bicep | 0 .../natRules/README.md} | 0 .../natRules/main.bicep | 0 .../natRules/version.json | 0 .../virtualNetworkGateways/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../virtualNetworks/.test/min/main.test.bicep | 0 .../.test/vnetPeering/dependencies.bicep | 0 .../.test/vnetPeering/main.test.bicep | 0 .../virtualNetworks/README.md} | 0 .../virtualNetworks/main.bicep | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../virtualNetworks/subnets/README.md} | 0 .../virtualNetworks/subnets/main.bicep | 0 .../virtualNetworks/subnets/version.json | 0 .../virtualNetworks/version.json | 0 .../virtualNetworkPeerings/README.md} | 0 .../virtualNetworkPeerings/main.bicep | 0 .../virtualNetworkPeerings/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../virtualWans/.test/common/main.test.bicep | 0 .../virtualWans/.test/min/main.test.bicep | 0 .../virtualWans/README.md} | 0 .../virtualWans/main.bicep | 0 .../virtualWans/version.json | 0 .../.test/common/dependencies.bicep | 0 .../vpnGateways/.test/common/main.test.bicep | 0 .../vpnGateways/.test/min/dependencies.bicep | 0 .../vpnGateways/.test/min/main.test.bicep | 0 .../vpnGateways/README.md} | 0 .../vpnGateways/connections/README.md} | 0 .../vpnGateways/connections/main.bicep | 0 .../vpnGateways/connections/version.json | 0 .../vpnGateways/main.bicep | 0 .../vpnGateways/natRules/README.md} | 0 .../vpnGateways/natRules/main.bicep | 0 .../vpnGateways/natRules/version.json | 0 .../vpnGateways/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../vpnSites/.test/common/dependencies.bicep | 0 .../vpnSites/.test/common/main.test.bicep | 0 .../vpnSites/.test/min/dependencies.bicep | 0 .../vpnSites/.test/min/main.test.bicep | 0 .../readme.md => Network/vpnSites/README.md} | 0 .../vpnSites/main.bicep | 0 .../vpnSites/version.json | 0 modules/Storage/storageAccounts/README.md | 26 ++++++++----------- .../storageAccounts/blobServices/README.md | 2 +- .../storageAccounts/fileServices/README.md | 2 +- modules/Storage/storageAccounts/main.bicep | 2 +- .../storageAccounts/queueServices/README.md | 2 +- .../storageAccounts/tableServices/README.md | 2 +- 394 files changed, 16 insertions(+), 20 deletions(-) rename modules/{Microsoft.Network => Network}/applicationGatewayWebApplicationFirewallPolicies/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network/applicationGatewayWebApplicationFirewallPolicies/readme.md => Network/applicationGatewayWebApplicationFirewallPolicies/README.md} (100%) rename modules/{Microsoft.Network => Network}/applicationGatewayWebApplicationFirewallPolicies/main.bicep (100%) rename modules/{Microsoft.Network => Network}/applicationGatewayWebApplicationFirewallPolicies/version.json (100%) rename modules/{Microsoft.Network => Network}/applicationGateways/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/applicationGateways/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/applicationGateways/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network/applicationGateways/readme.md => Network/applicationGateways/README.md} (100%) rename modules/{Microsoft.Network => Network}/applicationGateways/main.bicep (100%) rename modules/{Microsoft.Network => Network}/applicationGateways/version.json (100%) rename modules/{Microsoft.Network => Network}/applicationSecurityGroups/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/applicationSecurityGroups/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/applicationSecurityGroups/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network/applicationSecurityGroups/readme.md => Network/applicationSecurityGroups/README.md} (100%) rename modules/{Microsoft.Network => Network}/applicationSecurityGroups/main.bicep (100%) rename modules/{Microsoft.Network => Network}/applicationSecurityGroups/version.json (100%) rename modules/{Microsoft.Network => Network}/azureFirewalls/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/azureFirewalls/.test/addpip/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/azureFirewalls/.test/addpip/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/azureFirewalls/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/azureFirewalls/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/azureFirewalls/.test/custompip/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/azureFirewalls/.test/custompip/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/azureFirewalls/.test/hubcommon/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/azureFirewalls/.test/hubcommon/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/azureFirewalls/.test/hubmin/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/azureFirewalls/.test/hubmin/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/azureFirewalls/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/azureFirewalls/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/azureFirewalls/readme.md => Network/azureFirewalls/README.md} (100%) rename modules/{Microsoft.Network => Network}/azureFirewalls/main.bicep (100%) rename modules/{Microsoft.Network => Network}/azureFirewalls/version.json (100%) rename modules/{Microsoft.Network => Network}/bastionHosts/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/bastionHosts/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/bastionHosts/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/bastionHosts/.test/custompip/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/bastionHosts/.test/custompip/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/bastionHosts/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/bastionHosts/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/bastionHosts/readme.md => Network/bastionHosts/README.md} (100%) rename modules/{Microsoft.Network => Network}/bastionHosts/main.bicep (100%) rename modules/{Microsoft.Network => Network}/bastionHosts/version.json (100%) rename modules/{Microsoft.Network => Network}/connections/.test/vnet2vnet/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/connections/.test/vnet2vnet/main.test.bicep (100%) rename modules/{Microsoft.Network/connections/readme.md => Network/connections/README.md} (100%) rename modules/{Microsoft.Network => Network}/connections/main.bicep (100%) rename modules/{Microsoft.Network => Network}/connections/version.json (100%) rename modules/{Microsoft.Network => Network}/ddosProtectionPlans/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/ddosProtectionPlans/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/ddosProtectionPlans/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/ddosProtectionPlans/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/ddosProtectionPlans/readme.md => Network/ddosProtectionPlans/README.md} (100%) rename modules/{Microsoft.Network => Network}/ddosProtectionPlans/main.bicep (100%) rename modules/{Microsoft.Network => Network}/ddosProtectionPlans/version.json (100%) rename modules/{Microsoft.Network => Network}/dnsResolvers/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/dnsResolvers/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/dnsResolvers/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network/dnsResolvers/readme.md => Network/dnsResolvers/README.md} (100%) rename modules/{Microsoft.Network => Network}/dnsResolvers/main.bicep (100%) rename modules/{Microsoft.Network => Network}/dnsResolvers/version.json (100%) rename modules/{Microsoft.Network => Network}/dnsZones/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/dnsZones/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/dnsZones/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/dnsZones/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/dnsZones/A/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network/dnsZones/A/readme.md => Network/dnsZones/A/README.md} (100%) rename modules/{Microsoft.Network => Network}/dnsZones/A/main.bicep (100%) rename modules/{Microsoft.Network => Network}/dnsZones/A/version.json (100%) rename modules/{Microsoft.Network => Network}/dnsZones/AAAA/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network/dnsZones/AAAA/readme.md => Network/dnsZones/AAAA/README.md} (100%) rename modules/{Microsoft.Network => Network}/dnsZones/AAAA/main.bicep (100%) rename modules/{Microsoft.Network => Network}/dnsZones/AAAA/version.json (100%) rename modules/{Microsoft.Network => Network}/dnsZones/CAA/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network/dnsZones/CAA/readme.md => Network/dnsZones/CAA/README.md} (100%) rename modules/{Microsoft.Network => Network}/dnsZones/CAA/main.bicep (100%) rename modules/{Microsoft.Network => Network}/dnsZones/CAA/version.json (100%) rename modules/{Microsoft.Network => Network}/dnsZones/CNAME/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network/dnsZones/CNAME/readme.md => Network/dnsZones/CNAME/README.md} (100%) rename modules/{Microsoft.Network => Network}/dnsZones/CNAME/main.bicep (100%) rename modules/{Microsoft.Network => Network}/dnsZones/CNAME/version.json (100%) rename modules/{Microsoft.Network => Network}/dnsZones/MX/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network/dnsZones/MX/readme.md => Network/dnsZones/MX/README.md} (100%) rename modules/{Microsoft.Network => Network}/dnsZones/MX/main.bicep (100%) rename modules/{Microsoft.Network => Network}/dnsZones/MX/version.json (100%) rename modules/{Microsoft.Network => Network}/dnsZones/NS/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network/dnsZones/NS/readme.md => Network/dnsZones/NS/README.md} (100%) rename modules/{Microsoft.Network => Network}/dnsZones/NS/main.bicep (100%) rename modules/{Microsoft.Network => Network}/dnsZones/NS/version.json (100%) rename modules/{Microsoft.Network => Network}/dnsZones/PTR/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network/dnsZones/PTR/readme.md => Network/dnsZones/PTR/README.md} (100%) rename modules/{Microsoft.Network => Network}/dnsZones/PTR/main.bicep (100%) rename modules/{Microsoft.Network => Network}/dnsZones/PTR/version.json (100%) rename modules/{Microsoft.Network/dnsZones/readme.md => Network/dnsZones/README.md} (100%) rename modules/{Microsoft.Network => Network}/dnsZones/SOA/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network/dnsZones/SOA/readme.md => Network/dnsZones/SOA/README.md} (100%) rename modules/{Microsoft.Network => Network}/dnsZones/SOA/main.bicep (100%) rename modules/{Microsoft.Network => Network}/dnsZones/SOA/version.json (100%) rename modules/{Microsoft.Network => Network}/dnsZones/SRV/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network/dnsZones/SRV/readme.md => Network/dnsZones/SRV/README.md} (100%) rename modules/{Microsoft.Network => Network}/dnsZones/SRV/main.bicep (100%) rename modules/{Microsoft.Network => Network}/dnsZones/SRV/version.json (100%) rename modules/{Microsoft.Network => Network}/dnsZones/TXT/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network/dnsZones/TXT/readme.md => Network/dnsZones/TXT/README.md} (100%) rename modules/{Microsoft.Network => Network}/dnsZones/TXT/main.bicep (100%) rename modules/{Microsoft.Network => Network}/dnsZones/TXT/version.json (100%) rename modules/{Microsoft.Network => Network}/dnsZones/main.bicep (100%) rename modules/{Microsoft.Network => Network}/dnsZones/version.json (100%) rename modules/{Microsoft.Network => Network}/expressRouteCircuits/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/expressRouteCircuits/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/expressRouteCircuits/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/expressRouteCircuits/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/expressRouteCircuits/readme.md => Network/expressRouteCircuits/README.md} (100%) rename modules/{Microsoft.Network => Network}/expressRouteCircuits/main.bicep (100%) rename modules/{Microsoft.Network => Network}/expressRouteCircuits/version.json (100%) rename modules/{Microsoft.Network => Network}/expressRouteGateway/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/expressRouteGateway/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/expressRouteGateway/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network/expressRouteGateway/readme.md => Network/expressRouteGateway/README.md} (100%) rename modules/{Microsoft.Network => Network}/expressRouteGateway/main.bicep (100%) rename modules/{Microsoft.Network => Network}/expressRouteGateway/version.json (100%) rename modules/{Microsoft.Network => Network}/firewallPolicies/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/firewallPolicies/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/firewallPolicies/readme.md => Network/firewallPolicies/README.md} (100%) rename modules/{Microsoft.Network => Network}/firewallPolicies/main.bicep (100%) rename modules/{Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md => Network/firewallPolicies/ruleCollectionGroups/README.md} (100%) rename modules/{Microsoft.Network => Network}/firewallPolicies/ruleCollectionGroups/main.bicep (100%) rename modules/{Microsoft.Network => Network}/firewallPolicies/ruleCollectionGroups/version.json (100%) rename modules/{Microsoft.Network => Network}/firewallPolicies/version.json (100%) rename modules/{Microsoft.Network => Network}/frontDoors/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/frontDoors/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/frontDoors/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/frontDoors/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/frontDoors/readme.md => Network/frontDoors/README.md} (100%) rename modules/{Microsoft.Network => Network}/frontDoors/main.bicep (100%) rename modules/{Microsoft.Network => Network}/frontDoors/version.json (100%) rename modules/{Microsoft.Network => Network}/ipGroups/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/ipGroups/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/ipGroups/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/ipGroups/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/ipGroups/readme.md => Network/ipGroups/README.md} (100%) rename modules/{Microsoft.Network => Network}/ipGroups/main.bicep (100%) rename modules/{Microsoft.Network => Network}/ipGroups/version.json (100%) rename modules/{Microsoft.Network => Network}/loadBalancers/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/loadBalancers/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/loadBalancers/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/loadBalancers/.test/internal/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/loadBalancers/.test/internal/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/loadBalancers/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/loadBalancers/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/loadBalancers/readme.md => Network/loadBalancers/README.md} (100%) rename modules/{Microsoft.Network/loadBalancers/backendAddressPools/readme.md => Network/loadBalancers/backendAddressPools/README.md} (100%) rename modules/{Microsoft.Network => Network}/loadBalancers/backendAddressPools/main.bicep (100%) rename modules/{Microsoft.Network => Network}/loadBalancers/backendAddressPools/version.json (100%) rename modules/{Microsoft.Network/loadBalancers/inboundNatRules/readme.md => Network/loadBalancers/inboundNatRules/README.md} (100%) rename modules/{Microsoft.Network => Network}/loadBalancers/inboundNatRules/main.bicep (100%) rename modules/{Microsoft.Network => Network}/loadBalancers/inboundNatRules/version.json (100%) rename modules/{Microsoft.Network => Network}/loadBalancers/main.bicep (100%) rename modules/{Microsoft.Network => Network}/loadBalancers/version.json (100%) rename modules/{Microsoft.Network => Network}/localNetworkGateways/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/localNetworkGateways/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/localNetworkGateways/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/localNetworkGateways/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/localNetworkGateways/readme.md => Network/localNetworkGateways/README.md} (100%) rename modules/{Microsoft.Network => Network}/localNetworkGateways/main.bicep (100%) rename modules/{Microsoft.Network => Network}/localNetworkGateways/version.json (100%) rename modules/{Microsoft.Network => Network}/natGateways/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/natGateways/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/natGateways/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network/natGateways/readme.md => Network/natGateways/README.md} (100%) rename modules/{Microsoft.Network => Network}/natGateways/main.bicep (100%) rename modules/{Microsoft.Network => Network}/natGateways/version.json (100%) rename modules/{Microsoft.Network => Network}/networkInterfaces/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/networkInterfaces/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/networkInterfaces/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/networkInterfaces/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/networkInterfaces/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/networkInterfaces/readme.md => Network/networkInterfaces/README.md} (100%) rename modules/{Microsoft.Network => Network}/networkInterfaces/main.bicep (100%) rename modules/{Microsoft.Network => Network}/networkInterfaces/version.json (100%) rename modules/{Microsoft.Network => Network}/networkManagers/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/networkManagers/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/networkManagers/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network/networkManagers/readme.md => Network/networkManagers/README.md} (100%) rename modules/{Microsoft.Network/networkManagers/connectivityConfigurations/readme.md => Network/networkManagers/connectivityConfigurations/README.md} (100%) rename modules/{Microsoft.Network => Network}/networkManagers/connectivityConfigurations/main.bicep (100%) rename modules/{Microsoft.Network => Network}/networkManagers/connectivityConfigurations/version.json (100%) rename modules/{Microsoft.Network => Network}/networkManagers/main.bicep (100%) rename modules/{Microsoft.Network/networkManagers/networkGroups/readme.md => Network/networkManagers/networkGroups/README.md} (100%) rename modules/{Microsoft.Network => Network}/networkManagers/networkGroups/main.bicep (100%) rename modules/{Microsoft.Network/networkManagers/networkGroups/staticMembers/readme.md => Network/networkManagers/networkGroups/staticMembers/README.md} (100%) rename modules/{Microsoft.Network => Network}/networkManagers/networkGroups/staticMembers/main.bicep (100%) rename modules/{Microsoft.Network => Network}/networkManagers/networkGroups/staticMembers/version.json (100%) rename modules/{Microsoft.Network => Network}/networkManagers/networkGroups/version.json (100%) rename modules/{Microsoft.Network/networkManagers/scopeConnections/readme.md => Network/networkManagers/scopeConnections/README.md} (100%) rename modules/{Microsoft.Network => Network}/networkManagers/scopeConnections/main.bicep (100%) rename modules/{Microsoft.Network => Network}/networkManagers/scopeConnections/version.json (100%) rename modules/{Microsoft.Network/networkManagers/securityAdminConfigurations/readme.md => Network/networkManagers/securityAdminConfigurations/README.md} (100%) rename modules/{Microsoft.Network => Network}/networkManagers/securityAdminConfigurations/main.bicep (100%) rename modules/{Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/readme.md => Network/networkManagers/securityAdminConfigurations/ruleCollections/README.md} (100%) rename modules/{Microsoft.Network => Network}/networkManagers/securityAdminConfigurations/ruleCollections/main.bicep (100%) rename modules/{Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/readme.md => Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/README.md} (100%) rename modules/{Microsoft.Network => Network}/networkManagers/securityAdminConfigurations/ruleCollections/rules/main.bicep (100%) rename modules/{Microsoft.Network => Network}/networkManagers/securityAdminConfigurations/ruleCollections/rules/version.json (100%) rename modules/{Microsoft.Network => Network}/networkManagers/securityAdminConfigurations/ruleCollections/version.json (100%) rename modules/{Microsoft.Network => Network}/networkManagers/securityAdminConfigurations/version.json (100%) rename modules/{Microsoft.Network => Network}/networkManagers/version.json (100%) rename modules/{Microsoft.Network => Network}/networkSecurityGroups/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/networkSecurityGroups/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/networkSecurityGroups/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/networkSecurityGroups/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/networkSecurityGroups/readme.md => Network/networkSecurityGroups/README.md} (100%) rename modules/{Microsoft.Network => Network}/networkSecurityGroups/main.bicep (100%) rename modules/{Microsoft.Network/networkSecurityGroups/securityRules/readme.md => Network/networkSecurityGroups/securityRules/README.md} (100%) rename modules/{Microsoft.Network => Network}/networkSecurityGroups/securityRules/main.bicep (100%) rename modules/{Microsoft.Network => Network}/networkSecurityGroups/securityRules/version.json (100%) rename modules/{Microsoft.Network => Network}/networkSecurityGroups/version.json (100%) rename modules/{Microsoft.Network => Network}/networkWatchers/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/networkWatchers/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/networkWatchers/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/networkWatchers/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/networkWatchers/readme.md => Network/networkWatchers/README.md} (100%) rename modules/{Microsoft.Network/networkWatchers/connectionMonitors/readme.md => Network/networkWatchers/connectionMonitors/README.md} (100%) rename modules/{Microsoft.Network => Network}/networkWatchers/connectionMonitors/main.bicep (100%) rename modules/{Microsoft.Network => Network}/networkWatchers/connectionMonitors/version.json (100%) rename modules/{Microsoft.Network/networkWatchers/flowLogs/readme.md => Network/networkWatchers/flowLogs/README.md} (100%) rename modules/{Microsoft.Network => Network}/networkWatchers/flowLogs/main.bicep (100%) rename modules/{Microsoft.Network => Network}/networkWatchers/flowLogs/version.json (100%) rename modules/{Microsoft.Network => Network}/networkWatchers/main.bicep (100%) rename modules/{Microsoft.Network => Network}/networkWatchers/version.json (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/A/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network/privateDnsZones/A/readme.md => Network/privateDnsZones/A/README.md} (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/A/main.bicep (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/A/version.json (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/AAAA/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network/privateDnsZones/AAAA/readme.md => Network/privateDnsZones/AAAA/README.md} (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/AAAA/main.bicep (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/AAAA/version.json (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/CNAME/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network/privateDnsZones/CNAME/readme.md => Network/privateDnsZones/CNAME/README.md} (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/CNAME/main.bicep (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/CNAME/version.json (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/MX/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network/privateDnsZones/MX/readme.md => Network/privateDnsZones/MX/README.md} (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/MX/main.bicep (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/MX/version.json (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/PTR/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network/privateDnsZones/PTR/readme.md => Network/privateDnsZones/PTR/README.md} (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/PTR/main.bicep (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/PTR/version.json (100%) rename modules/{Microsoft.Network/privateDnsZones/readme.md => Network/privateDnsZones/README.md} (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/SOA/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network/privateDnsZones/SOA/readme.md => Network/privateDnsZones/SOA/README.md} (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/SOA/main.bicep (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/SOA/version.json (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/SRV/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network/privateDnsZones/SRV/readme.md => Network/privateDnsZones/SRV/README.md} (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/SRV/main.bicep (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/SRV/version.json (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/TXT/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network/privateDnsZones/TXT/readme.md => Network/privateDnsZones/TXT/README.md} (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/TXT/main.bicep (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/TXT/version.json (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/main.bicep (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/version.json (100%) rename modules/{Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md => Network/privateDnsZones/virtualNetworkLinks/README.md} (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/virtualNetworkLinks/main.bicep (100%) rename modules/{Microsoft.Network => Network}/privateDnsZones/virtualNetworkLinks/version.json (100%) rename modules/{Microsoft.Network => Network}/privateEndpoints/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/privateEndpoints/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/privateEndpoints/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/privateEndpoints/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/privateEndpoints/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/privateEndpoints/readme.md => Network/privateEndpoints/README.md} (100%) rename modules/{Microsoft.Network => Network}/privateEndpoints/main.bicep (100%) rename modules/{Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md => Network/privateEndpoints/privateDnsZoneGroups/README.md} (100%) rename modules/{Microsoft.Network => Network}/privateEndpoints/privateDnsZoneGroups/main.bicep (100%) rename modules/{Microsoft.Network => Network}/privateEndpoints/privateDnsZoneGroups/version.json (100%) rename modules/{Microsoft.Network => Network}/privateEndpoints/version.json (100%) rename modules/{Microsoft.Network => Network}/privateLinkServices/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/privateLinkServices/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/privateLinkServices/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/privateLinkServices/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/privateLinkServices/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/privateLinkServices/readme.md => Network/privateLinkServices/README.md} (100%) rename modules/{Microsoft.Network => Network}/privateLinkServices/main.bicep (100%) rename modules/{Microsoft.Network => Network}/privateLinkServices/version.json (100%) rename modules/{Microsoft.Network => Network}/publicIPAddresses/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/publicIPAddresses/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/publicIPAddresses/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/publicIPAddresses/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/publicIPAddresses/readme.md => Network/publicIPAddresses/README.md} (100%) rename modules/{Microsoft.Network => Network}/publicIPAddresses/main.bicep (100%) rename modules/{Microsoft.Network => Network}/publicIPAddresses/version.json (100%) rename modules/{Microsoft.Network => Network}/publicIPPrefixes/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/publicIPPrefixes/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/publicIPPrefixes/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/publicIPPrefixes/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/publicIPPrefixes/readme.md => Network/publicIPPrefixes/README.md} (100%) rename modules/{Microsoft.Network => Network}/publicIPPrefixes/main.bicep (100%) rename modules/{Microsoft.Network => Network}/publicIPPrefixes/version.json (100%) rename modules/{Microsoft.Network => Network}/routeTables/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/routeTables/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/routeTables/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/routeTables/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/routeTables/readme.md => Network/routeTables/README.md} (100%) rename modules/{Microsoft.Network => Network}/routeTables/main.bicep (100%) rename modules/{Microsoft.Network => Network}/routeTables/version.json (100%) rename modules/{Microsoft.Network => Network}/trafficmanagerprofiles/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/trafficmanagerprofiles/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/trafficmanagerprofiles/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/trafficmanagerprofiles/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/trafficmanagerprofiles/readme.md => Network/trafficmanagerprofiles/README.md} (100%) rename modules/{Microsoft.Network => Network}/trafficmanagerprofiles/main.bicep (100%) rename modules/{Microsoft.Network => Network}/trafficmanagerprofiles/version.json (100%) rename modules/{Microsoft.Network => Network}/virtualHubs/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualHubs/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualHubs/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualHubs/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/virtualHubs/readme.md => Network/virtualHubs/README.md} (100%) rename modules/{Microsoft.Network/virtualHubs/hubRouteTables/readme.md => Network/virtualHubs/hubRouteTables/README.md} (100%) rename modules/{Microsoft.Network => Network}/virtualHubs/hubRouteTables/main.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualHubs/hubRouteTables/version.json (100%) rename modules/{Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/readme.md => Network/virtualHubs/hubVirtualNetworkConnections/README.md} (100%) rename modules/{Microsoft.Network => Network}/virtualHubs/hubVirtualNetworkConnections/main.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualHubs/hubVirtualNetworkConnections/version.json (100%) rename modules/{Microsoft.Network => Network}/virtualHubs/main.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualHubs/version.json (100%) rename modules/{Microsoft.Network => Network}/virtualNetworkGateways/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualNetworkGateways/.test/aadvpn/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualNetworkGateways/.test/aadvpn/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualNetworkGateways/.test/expressRoute/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualNetworkGateways/.test/expressRoute/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualNetworkGateways/.test/vpn/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualNetworkGateways/.test/vpn/main.test.bicep (100%) rename modules/{Microsoft.Network/virtualNetworkGateways/readme.md => Network/virtualNetworkGateways/README.md} (100%) rename modules/{Microsoft.Network => Network}/virtualNetworkGateways/main.bicep (100%) rename modules/{Microsoft.Network/virtualNetworkGateways/natRules/readme.md => Network/virtualNetworkGateways/natRules/README.md} (100%) rename modules/{Microsoft.Network => Network}/virtualNetworkGateways/natRules/main.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualNetworkGateways/natRules/version.json (100%) rename modules/{Microsoft.Network => Network}/virtualNetworkGateways/version.json (100%) rename modules/{Microsoft.Network => Network}/virtualNetworks/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualNetworks/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualNetworks/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualNetworks/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualNetworks/.test/vnetPeering/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualNetworks/.test/vnetPeering/main.test.bicep (100%) rename modules/{Microsoft.Network/virtualNetworks/readme.md => Network/virtualNetworks/README.md} (100%) rename modules/{Microsoft.Network => Network}/virtualNetworks/main.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualNetworks/subnets/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network/virtualNetworks/subnets/readme.md => Network/virtualNetworks/subnets/README.md} (100%) rename modules/{Microsoft.Network => Network}/virtualNetworks/subnets/main.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualNetworks/subnets/version.json (100%) rename modules/{Microsoft.Network => Network}/virtualNetworks/version.json (100%) rename modules/{Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md => Network/virtualNetworks/virtualNetworkPeerings/README.md} (100%) rename modules/{Microsoft.Network => Network}/virtualNetworks/virtualNetworkPeerings/main.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualNetworks/virtualNetworkPeerings/version.json (100%) rename modules/{Microsoft.Network => Network}/virtualWans/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualWans/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualWans/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualWans/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/virtualWans/readme.md => Network/virtualWans/README.md} (100%) rename modules/{Microsoft.Network => Network}/virtualWans/main.bicep (100%) rename modules/{Microsoft.Network => Network}/virtualWans/version.json (100%) rename modules/{Microsoft.Network => Network}/vpnGateways/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/vpnGateways/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/vpnGateways/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/vpnGateways/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/vpnGateways/readme.md => Network/vpnGateways/README.md} (100%) rename modules/{Microsoft.Network/vpnGateways/connections/readme.md => Network/vpnGateways/connections/README.md} (100%) rename modules/{Microsoft.Network => Network}/vpnGateways/connections/main.bicep (100%) rename modules/{Microsoft.Network => Network}/vpnGateways/connections/version.json (100%) rename modules/{Microsoft.Network => Network}/vpnGateways/main.bicep (100%) rename modules/{Microsoft.Network/vpnGateways/natRules/readme.md => Network/vpnGateways/natRules/README.md} (100%) rename modules/{Microsoft.Network => Network}/vpnGateways/natRules/main.bicep (100%) rename modules/{Microsoft.Network => Network}/vpnGateways/natRules/version.json (100%) rename modules/{Microsoft.Network => Network}/vpnGateways/version.json (100%) rename modules/{Microsoft.Network => Network}/vpnSites/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Network => Network}/vpnSites/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/vpnSites/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Network => Network}/vpnSites/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.Network => Network}/vpnSites/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Network/vpnSites/readme.md => Network/vpnSites/README.md} (100%) rename modules/{Microsoft.Network => Network}/vpnSites/main.bicep (100%) rename modules/{Microsoft.Network => Network}/vpnSites/version.json (100%) diff --git a/modules/Microsoft.Network/applicationGatewayWebApplicationFirewallPolicies/.test/common/main.test.bicep b/modules/Network/applicationGatewayWebApplicationFirewallPolicies/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/applicationGatewayWebApplicationFirewallPolicies/.test/common/main.test.bicep rename to modules/Network/applicationGatewayWebApplicationFirewallPolicies/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/applicationGatewayWebApplicationFirewallPolicies/readme.md b/modules/Network/applicationGatewayWebApplicationFirewallPolicies/README.md similarity index 100% rename from modules/Microsoft.Network/applicationGatewayWebApplicationFirewallPolicies/readme.md rename to modules/Network/applicationGatewayWebApplicationFirewallPolicies/README.md diff --git a/modules/Microsoft.Network/applicationGatewayWebApplicationFirewallPolicies/main.bicep b/modules/Network/applicationGatewayWebApplicationFirewallPolicies/main.bicep similarity index 100% rename from modules/Microsoft.Network/applicationGatewayWebApplicationFirewallPolicies/main.bicep rename to modules/Network/applicationGatewayWebApplicationFirewallPolicies/main.bicep diff --git a/modules/Microsoft.Network/applicationGatewayWebApplicationFirewallPolicies/version.json b/modules/Network/applicationGatewayWebApplicationFirewallPolicies/version.json similarity index 100% rename from modules/Microsoft.Network/applicationGatewayWebApplicationFirewallPolicies/version.json rename to modules/Network/applicationGatewayWebApplicationFirewallPolicies/version.json diff --git a/modules/Microsoft.Network/applicationGateways/.bicep/nested_roleAssignments.bicep b/modules/Network/applicationGateways/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/applicationGateways/.bicep/nested_roleAssignments.bicep rename to modules/Network/applicationGateways/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/applicationGateways/.test/common/dependencies.bicep b/modules/Network/applicationGateways/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/applicationGateways/.test/common/dependencies.bicep rename to modules/Network/applicationGateways/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/applicationGateways/.test/common/main.test.bicep b/modules/Network/applicationGateways/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/applicationGateways/.test/common/main.test.bicep rename to modules/Network/applicationGateways/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/applicationGateways/readme.md b/modules/Network/applicationGateways/README.md similarity index 100% rename from modules/Microsoft.Network/applicationGateways/readme.md rename to modules/Network/applicationGateways/README.md diff --git a/modules/Microsoft.Network/applicationGateways/main.bicep b/modules/Network/applicationGateways/main.bicep similarity index 100% rename from modules/Microsoft.Network/applicationGateways/main.bicep rename to modules/Network/applicationGateways/main.bicep diff --git a/modules/Microsoft.Network/applicationGateways/version.json b/modules/Network/applicationGateways/version.json similarity index 100% rename from modules/Microsoft.Network/applicationGateways/version.json rename to modules/Network/applicationGateways/version.json diff --git a/modules/Microsoft.Network/applicationSecurityGroups/.bicep/nested_roleAssignments.bicep b/modules/Network/applicationSecurityGroups/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/applicationSecurityGroups/.bicep/nested_roleAssignments.bicep rename to modules/Network/applicationSecurityGroups/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/applicationSecurityGroups/.test/common/dependencies.bicep b/modules/Network/applicationSecurityGroups/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/applicationSecurityGroups/.test/common/dependencies.bicep rename to modules/Network/applicationSecurityGroups/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/applicationSecurityGroups/.test/common/main.test.bicep b/modules/Network/applicationSecurityGroups/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/applicationSecurityGroups/.test/common/main.test.bicep rename to modules/Network/applicationSecurityGroups/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/applicationSecurityGroups/readme.md b/modules/Network/applicationSecurityGroups/README.md similarity index 100% rename from modules/Microsoft.Network/applicationSecurityGroups/readme.md rename to modules/Network/applicationSecurityGroups/README.md diff --git a/modules/Microsoft.Network/applicationSecurityGroups/main.bicep b/modules/Network/applicationSecurityGroups/main.bicep similarity index 100% rename from modules/Microsoft.Network/applicationSecurityGroups/main.bicep rename to modules/Network/applicationSecurityGroups/main.bicep diff --git a/modules/Microsoft.Network/applicationSecurityGroups/version.json b/modules/Network/applicationSecurityGroups/version.json similarity index 100% rename from modules/Microsoft.Network/applicationSecurityGroups/version.json rename to modules/Network/applicationSecurityGroups/version.json diff --git a/modules/Microsoft.Network/azureFirewalls/.bicep/nested_roleAssignments.bicep b/modules/Network/azureFirewalls/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/azureFirewalls/.bicep/nested_roleAssignments.bicep rename to modules/Network/azureFirewalls/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/azureFirewalls/.test/addpip/dependencies.bicep b/modules/Network/azureFirewalls/.test/addpip/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/azureFirewalls/.test/addpip/dependencies.bicep rename to modules/Network/azureFirewalls/.test/addpip/dependencies.bicep diff --git a/modules/Microsoft.Network/azureFirewalls/.test/addpip/main.test.bicep b/modules/Network/azureFirewalls/.test/addpip/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/azureFirewalls/.test/addpip/main.test.bicep rename to modules/Network/azureFirewalls/.test/addpip/main.test.bicep diff --git a/modules/Microsoft.Network/azureFirewalls/.test/common/dependencies.bicep b/modules/Network/azureFirewalls/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/azureFirewalls/.test/common/dependencies.bicep rename to modules/Network/azureFirewalls/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/azureFirewalls/.test/common/main.test.bicep b/modules/Network/azureFirewalls/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/azureFirewalls/.test/common/main.test.bicep rename to modules/Network/azureFirewalls/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/azureFirewalls/.test/custompip/dependencies.bicep b/modules/Network/azureFirewalls/.test/custompip/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/azureFirewalls/.test/custompip/dependencies.bicep rename to modules/Network/azureFirewalls/.test/custompip/dependencies.bicep diff --git a/modules/Microsoft.Network/azureFirewalls/.test/custompip/main.test.bicep b/modules/Network/azureFirewalls/.test/custompip/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/azureFirewalls/.test/custompip/main.test.bicep rename to modules/Network/azureFirewalls/.test/custompip/main.test.bicep diff --git a/modules/Microsoft.Network/azureFirewalls/.test/hubcommon/dependencies.bicep b/modules/Network/azureFirewalls/.test/hubcommon/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/azureFirewalls/.test/hubcommon/dependencies.bicep rename to modules/Network/azureFirewalls/.test/hubcommon/dependencies.bicep diff --git a/modules/Microsoft.Network/azureFirewalls/.test/hubcommon/main.test.bicep b/modules/Network/azureFirewalls/.test/hubcommon/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/azureFirewalls/.test/hubcommon/main.test.bicep rename to modules/Network/azureFirewalls/.test/hubcommon/main.test.bicep diff --git a/modules/Microsoft.Network/azureFirewalls/.test/hubmin/dependencies.bicep b/modules/Network/azureFirewalls/.test/hubmin/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/azureFirewalls/.test/hubmin/dependencies.bicep rename to modules/Network/azureFirewalls/.test/hubmin/dependencies.bicep diff --git a/modules/Microsoft.Network/azureFirewalls/.test/hubmin/main.test.bicep b/modules/Network/azureFirewalls/.test/hubmin/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/azureFirewalls/.test/hubmin/main.test.bicep rename to modules/Network/azureFirewalls/.test/hubmin/main.test.bicep diff --git a/modules/Microsoft.Network/azureFirewalls/.test/min/dependencies.bicep b/modules/Network/azureFirewalls/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/azureFirewalls/.test/min/dependencies.bicep rename to modules/Network/azureFirewalls/.test/min/dependencies.bicep diff --git a/modules/Microsoft.Network/azureFirewalls/.test/min/main.test.bicep b/modules/Network/azureFirewalls/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/azureFirewalls/.test/min/main.test.bicep rename to modules/Network/azureFirewalls/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/azureFirewalls/readme.md b/modules/Network/azureFirewalls/README.md similarity index 100% rename from modules/Microsoft.Network/azureFirewalls/readme.md rename to modules/Network/azureFirewalls/README.md diff --git a/modules/Microsoft.Network/azureFirewalls/main.bicep b/modules/Network/azureFirewalls/main.bicep similarity index 100% rename from modules/Microsoft.Network/azureFirewalls/main.bicep rename to modules/Network/azureFirewalls/main.bicep diff --git a/modules/Microsoft.Network/azureFirewalls/version.json b/modules/Network/azureFirewalls/version.json similarity index 100% rename from modules/Microsoft.Network/azureFirewalls/version.json rename to modules/Network/azureFirewalls/version.json diff --git a/modules/Microsoft.Network/bastionHosts/.bicep/nested_roleAssignments.bicep b/modules/Network/bastionHosts/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/bastionHosts/.bicep/nested_roleAssignments.bicep rename to modules/Network/bastionHosts/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/bastionHosts/.test/common/dependencies.bicep b/modules/Network/bastionHosts/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/bastionHosts/.test/common/dependencies.bicep rename to modules/Network/bastionHosts/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/bastionHosts/.test/common/main.test.bicep b/modules/Network/bastionHosts/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/bastionHosts/.test/common/main.test.bicep rename to modules/Network/bastionHosts/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/bastionHosts/.test/custompip/dependencies.bicep b/modules/Network/bastionHosts/.test/custompip/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/bastionHosts/.test/custompip/dependencies.bicep rename to modules/Network/bastionHosts/.test/custompip/dependencies.bicep diff --git a/modules/Microsoft.Network/bastionHosts/.test/custompip/main.test.bicep b/modules/Network/bastionHosts/.test/custompip/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/bastionHosts/.test/custompip/main.test.bicep rename to modules/Network/bastionHosts/.test/custompip/main.test.bicep diff --git a/modules/Microsoft.Network/bastionHosts/.test/min/dependencies.bicep b/modules/Network/bastionHosts/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/bastionHosts/.test/min/dependencies.bicep rename to modules/Network/bastionHosts/.test/min/dependencies.bicep diff --git a/modules/Microsoft.Network/bastionHosts/.test/min/main.test.bicep b/modules/Network/bastionHosts/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/bastionHosts/.test/min/main.test.bicep rename to modules/Network/bastionHosts/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/bastionHosts/readme.md b/modules/Network/bastionHosts/README.md similarity index 100% rename from modules/Microsoft.Network/bastionHosts/readme.md rename to modules/Network/bastionHosts/README.md diff --git a/modules/Microsoft.Network/bastionHosts/main.bicep b/modules/Network/bastionHosts/main.bicep similarity index 100% rename from modules/Microsoft.Network/bastionHosts/main.bicep rename to modules/Network/bastionHosts/main.bicep diff --git a/modules/Microsoft.Network/bastionHosts/version.json b/modules/Network/bastionHosts/version.json similarity index 100% rename from modules/Microsoft.Network/bastionHosts/version.json rename to modules/Network/bastionHosts/version.json diff --git a/modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep b/modules/Network/connections/.test/vnet2vnet/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/connections/.test/vnet2vnet/dependencies.bicep rename to modules/Network/connections/.test/vnet2vnet/dependencies.bicep diff --git a/modules/Microsoft.Network/connections/.test/vnet2vnet/main.test.bicep b/modules/Network/connections/.test/vnet2vnet/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/connections/.test/vnet2vnet/main.test.bicep rename to modules/Network/connections/.test/vnet2vnet/main.test.bicep diff --git a/modules/Microsoft.Network/connections/readme.md b/modules/Network/connections/README.md similarity index 100% rename from modules/Microsoft.Network/connections/readme.md rename to modules/Network/connections/README.md diff --git a/modules/Microsoft.Network/connections/main.bicep b/modules/Network/connections/main.bicep similarity index 100% rename from modules/Microsoft.Network/connections/main.bicep rename to modules/Network/connections/main.bicep diff --git a/modules/Microsoft.Network/connections/version.json b/modules/Network/connections/version.json similarity index 100% rename from modules/Microsoft.Network/connections/version.json rename to modules/Network/connections/version.json diff --git a/modules/Microsoft.Network/ddosProtectionPlans/.bicep/nested_roleAssignments.bicep b/modules/Network/ddosProtectionPlans/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/ddosProtectionPlans/.bicep/nested_roleAssignments.bicep rename to modules/Network/ddosProtectionPlans/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/ddosProtectionPlans/.test/common/dependencies.bicep b/modules/Network/ddosProtectionPlans/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/ddosProtectionPlans/.test/common/dependencies.bicep rename to modules/Network/ddosProtectionPlans/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/ddosProtectionPlans/.test/common/main.test.bicep b/modules/Network/ddosProtectionPlans/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/ddosProtectionPlans/.test/common/main.test.bicep rename to modules/Network/ddosProtectionPlans/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/ddosProtectionPlans/.test/min/main.test.bicep b/modules/Network/ddosProtectionPlans/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/ddosProtectionPlans/.test/min/main.test.bicep rename to modules/Network/ddosProtectionPlans/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/ddosProtectionPlans/readme.md b/modules/Network/ddosProtectionPlans/README.md similarity index 100% rename from modules/Microsoft.Network/ddosProtectionPlans/readme.md rename to modules/Network/ddosProtectionPlans/README.md diff --git a/modules/Microsoft.Network/ddosProtectionPlans/main.bicep b/modules/Network/ddosProtectionPlans/main.bicep similarity index 100% rename from modules/Microsoft.Network/ddosProtectionPlans/main.bicep rename to modules/Network/ddosProtectionPlans/main.bicep diff --git a/modules/Microsoft.Network/ddosProtectionPlans/version.json b/modules/Network/ddosProtectionPlans/version.json similarity index 100% rename from modules/Microsoft.Network/ddosProtectionPlans/version.json rename to modules/Network/ddosProtectionPlans/version.json diff --git a/modules/Microsoft.Network/dnsResolvers/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsResolvers/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/dnsResolvers/.bicep/nested_roleAssignments.bicep rename to modules/Network/dnsResolvers/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/dnsResolvers/.test/common/dependencies.bicep b/modules/Network/dnsResolvers/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/dnsResolvers/.test/common/dependencies.bicep rename to modules/Network/dnsResolvers/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/dnsResolvers/.test/common/main.test.bicep b/modules/Network/dnsResolvers/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/dnsResolvers/.test/common/main.test.bicep rename to modules/Network/dnsResolvers/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/dnsResolvers/readme.md b/modules/Network/dnsResolvers/README.md similarity index 100% rename from modules/Microsoft.Network/dnsResolvers/readme.md rename to modules/Network/dnsResolvers/README.md diff --git a/modules/Microsoft.Network/dnsResolvers/main.bicep b/modules/Network/dnsResolvers/main.bicep similarity index 100% rename from modules/Microsoft.Network/dnsResolvers/main.bicep rename to modules/Network/dnsResolvers/main.bicep diff --git a/modules/Microsoft.Network/dnsResolvers/version.json b/modules/Network/dnsResolvers/version.json similarity index 100% rename from modules/Microsoft.Network/dnsResolvers/version.json rename to modules/Network/dnsResolvers/version.json diff --git a/modules/Microsoft.Network/dnsZones/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/.bicep/nested_roleAssignments.bicep rename to modules/Network/dnsZones/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/dnsZones/.test/common/dependencies.bicep b/modules/Network/dnsZones/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/.test/common/dependencies.bicep rename to modules/Network/dnsZones/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/dnsZones/.test/common/main.test.bicep b/modules/Network/dnsZones/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/.test/common/main.test.bicep rename to modules/Network/dnsZones/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/dnsZones/.test/min/main.test.bicep b/modules/Network/dnsZones/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/.test/min/main.test.bicep rename to modules/Network/dnsZones/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/dnsZones/A/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/A/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/A/.bicep/nested_roleAssignments.bicep rename to modules/Network/dnsZones/A/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/dnsZones/A/readme.md b/modules/Network/dnsZones/A/README.md similarity index 100% rename from modules/Microsoft.Network/dnsZones/A/readme.md rename to modules/Network/dnsZones/A/README.md diff --git a/modules/Microsoft.Network/dnsZones/A/main.bicep b/modules/Network/dnsZones/A/main.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/A/main.bicep rename to modules/Network/dnsZones/A/main.bicep diff --git a/modules/Microsoft.Network/dnsZones/A/version.json b/modules/Network/dnsZones/A/version.json similarity index 100% rename from modules/Microsoft.Network/dnsZones/A/version.json rename to modules/Network/dnsZones/A/version.json diff --git a/modules/Microsoft.Network/dnsZones/AAAA/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/AAAA/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/AAAA/.bicep/nested_roleAssignments.bicep rename to modules/Network/dnsZones/AAAA/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/dnsZones/AAAA/readme.md b/modules/Network/dnsZones/AAAA/README.md similarity index 100% rename from modules/Microsoft.Network/dnsZones/AAAA/readme.md rename to modules/Network/dnsZones/AAAA/README.md diff --git a/modules/Microsoft.Network/dnsZones/AAAA/main.bicep b/modules/Network/dnsZones/AAAA/main.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/AAAA/main.bicep rename to modules/Network/dnsZones/AAAA/main.bicep diff --git a/modules/Microsoft.Network/dnsZones/AAAA/version.json b/modules/Network/dnsZones/AAAA/version.json similarity index 100% rename from modules/Microsoft.Network/dnsZones/AAAA/version.json rename to modules/Network/dnsZones/AAAA/version.json diff --git a/modules/Microsoft.Network/dnsZones/CAA/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/CAA/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/CAA/.bicep/nested_roleAssignments.bicep rename to modules/Network/dnsZones/CAA/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/dnsZones/CAA/readme.md b/modules/Network/dnsZones/CAA/README.md similarity index 100% rename from modules/Microsoft.Network/dnsZones/CAA/readme.md rename to modules/Network/dnsZones/CAA/README.md diff --git a/modules/Microsoft.Network/dnsZones/CAA/main.bicep b/modules/Network/dnsZones/CAA/main.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/CAA/main.bicep rename to modules/Network/dnsZones/CAA/main.bicep diff --git a/modules/Microsoft.Network/dnsZones/CAA/version.json b/modules/Network/dnsZones/CAA/version.json similarity index 100% rename from modules/Microsoft.Network/dnsZones/CAA/version.json rename to modules/Network/dnsZones/CAA/version.json diff --git a/modules/Microsoft.Network/dnsZones/CNAME/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/CNAME/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/CNAME/.bicep/nested_roleAssignments.bicep rename to modules/Network/dnsZones/CNAME/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/dnsZones/CNAME/readme.md b/modules/Network/dnsZones/CNAME/README.md similarity index 100% rename from modules/Microsoft.Network/dnsZones/CNAME/readme.md rename to modules/Network/dnsZones/CNAME/README.md diff --git a/modules/Microsoft.Network/dnsZones/CNAME/main.bicep b/modules/Network/dnsZones/CNAME/main.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/CNAME/main.bicep rename to modules/Network/dnsZones/CNAME/main.bicep diff --git a/modules/Microsoft.Network/dnsZones/CNAME/version.json b/modules/Network/dnsZones/CNAME/version.json similarity index 100% rename from modules/Microsoft.Network/dnsZones/CNAME/version.json rename to modules/Network/dnsZones/CNAME/version.json diff --git a/modules/Microsoft.Network/dnsZones/MX/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/MX/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/MX/.bicep/nested_roleAssignments.bicep rename to modules/Network/dnsZones/MX/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/dnsZones/MX/readme.md b/modules/Network/dnsZones/MX/README.md similarity index 100% rename from modules/Microsoft.Network/dnsZones/MX/readme.md rename to modules/Network/dnsZones/MX/README.md diff --git a/modules/Microsoft.Network/dnsZones/MX/main.bicep b/modules/Network/dnsZones/MX/main.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/MX/main.bicep rename to modules/Network/dnsZones/MX/main.bicep diff --git a/modules/Microsoft.Network/dnsZones/MX/version.json b/modules/Network/dnsZones/MX/version.json similarity index 100% rename from modules/Microsoft.Network/dnsZones/MX/version.json rename to modules/Network/dnsZones/MX/version.json diff --git a/modules/Microsoft.Network/dnsZones/NS/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/NS/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/NS/.bicep/nested_roleAssignments.bicep rename to modules/Network/dnsZones/NS/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/dnsZones/NS/readme.md b/modules/Network/dnsZones/NS/README.md similarity index 100% rename from modules/Microsoft.Network/dnsZones/NS/readme.md rename to modules/Network/dnsZones/NS/README.md diff --git a/modules/Microsoft.Network/dnsZones/NS/main.bicep b/modules/Network/dnsZones/NS/main.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/NS/main.bicep rename to modules/Network/dnsZones/NS/main.bicep diff --git a/modules/Microsoft.Network/dnsZones/NS/version.json b/modules/Network/dnsZones/NS/version.json similarity index 100% rename from modules/Microsoft.Network/dnsZones/NS/version.json rename to modules/Network/dnsZones/NS/version.json diff --git a/modules/Microsoft.Network/dnsZones/PTR/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/PTR/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/PTR/.bicep/nested_roleAssignments.bicep rename to modules/Network/dnsZones/PTR/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/dnsZones/PTR/readme.md b/modules/Network/dnsZones/PTR/README.md similarity index 100% rename from modules/Microsoft.Network/dnsZones/PTR/readme.md rename to modules/Network/dnsZones/PTR/README.md diff --git a/modules/Microsoft.Network/dnsZones/PTR/main.bicep b/modules/Network/dnsZones/PTR/main.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/PTR/main.bicep rename to modules/Network/dnsZones/PTR/main.bicep diff --git a/modules/Microsoft.Network/dnsZones/PTR/version.json b/modules/Network/dnsZones/PTR/version.json similarity index 100% rename from modules/Microsoft.Network/dnsZones/PTR/version.json rename to modules/Network/dnsZones/PTR/version.json diff --git a/modules/Microsoft.Network/dnsZones/readme.md b/modules/Network/dnsZones/README.md similarity index 100% rename from modules/Microsoft.Network/dnsZones/readme.md rename to modules/Network/dnsZones/README.md diff --git a/modules/Microsoft.Network/dnsZones/SOA/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/SOA/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/SOA/.bicep/nested_roleAssignments.bicep rename to modules/Network/dnsZones/SOA/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/dnsZones/SOA/readme.md b/modules/Network/dnsZones/SOA/README.md similarity index 100% rename from modules/Microsoft.Network/dnsZones/SOA/readme.md rename to modules/Network/dnsZones/SOA/README.md diff --git a/modules/Microsoft.Network/dnsZones/SOA/main.bicep b/modules/Network/dnsZones/SOA/main.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/SOA/main.bicep rename to modules/Network/dnsZones/SOA/main.bicep diff --git a/modules/Microsoft.Network/dnsZones/SOA/version.json b/modules/Network/dnsZones/SOA/version.json similarity index 100% rename from modules/Microsoft.Network/dnsZones/SOA/version.json rename to modules/Network/dnsZones/SOA/version.json diff --git a/modules/Microsoft.Network/dnsZones/SRV/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/SRV/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/SRV/.bicep/nested_roleAssignments.bicep rename to modules/Network/dnsZones/SRV/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/dnsZones/SRV/readme.md b/modules/Network/dnsZones/SRV/README.md similarity index 100% rename from modules/Microsoft.Network/dnsZones/SRV/readme.md rename to modules/Network/dnsZones/SRV/README.md diff --git a/modules/Microsoft.Network/dnsZones/SRV/main.bicep b/modules/Network/dnsZones/SRV/main.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/SRV/main.bicep rename to modules/Network/dnsZones/SRV/main.bicep diff --git a/modules/Microsoft.Network/dnsZones/SRV/version.json b/modules/Network/dnsZones/SRV/version.json similarity index 100% rename from modules/Microsoft.Network/dnsZones/SRV/version.json rename to modules/Network/dnsZones/SRV/version.json diff --git a/modules/Microsoft.Network/dnsZones/TXT/.bicep/nested_roleAssignments.bicep b/modules/Network/dnsZones/TXT/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/TXT/.bicep/nested_roleAssignments.bicep rename to modules/Network/dnsZones/TXT/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/dnsZones/TXT/readme.md b/modules/Network/dnsZones/TXT/README.md similarity index 100% rename from modules/Microsoft.Network/dnsZones/TXT/readme.md rename to modules/Network/dnsZones/TXT/README.md diff --git a/modules/Microsoft.Network/dnsZones/TXT/main.bicep b/modules/Network/dnsZones/TXT/main.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/TXT/main.bicep rename to modules/Network/dnsZones/TXT/main.bicep diff --git a/modules/Microsoft.Network/dnsZones/TXT/version.json b/modules/Network/dnsZones/TXT/version.json similarity index 100% rename from modules/Microsoft.Network/dnsZones/TXT/version.json rename to modules/Network/dnsZones/TXT/version.json diff --git a/modules/Microsoft.Network/dnsZones/main.bicep b/modules/Network/dnsZones/main.bicep similarity index 100% rename from modules/Microsoft.Network/dnsZones/main.bicep rename to modules/Network/dnsZones/main.bicep diff --git a/modules/Microsoft.Network/dnsZones/version.json b/modules/Network/dnsZones/version.json similarity index 100% rename from modules/Microsoft.Network/dnsZones/version.json rename to modules/Network/dnsZones/version.json diff --git a/modules/Microsoft.Network/expressRouteCircuits/.bicep/nested_roleAssignments.bicep b/modules/Network/expressRouteCircuits/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/expressRouteCircuits/.bicep/nested_roleAssignments.bicep rename to modules/Network/expressRouteCircuits/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/expressRouteCircuits/.test/common/dependencies.bicep b/modules/Network/expressRouteCircuits/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/expressRouteCircuits/.test/common/dependencies.bicep rename to modules/Network/expressRouteCircuits/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/expressRouteCircuits/.test/common/main.test.bicep b/modules/Network/expressRouteCircuits/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/expressRouteCircuits/.test/common/main.test.bicep rename to modules/Network/expressRouteCircuits/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/expressRouteCircuits/.test/min/main.test.bicep b/modules/Network/expressRouteCircuits/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/expressRouteCircuits/.test/min/main.test.bicep rename to modules/Network/expressRouteCircuits/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/expressRouteCircuits/readme.md b/modules/Network/expressRouteCircuits/README.md similarity index 100% rename from modules/Microsoft.Network/expressRouteCircuits/readme.md rename to modules/Network/expressRouteCircuits/README.md diff --git a/modules/Microsoft.Network/expressRouteCircuits/main.bicep b/modules/Network/expressRouteCircuits/main.bicep similarity index 100% rename from modules/Microsoft.Network/expressRouteCircuits/main.bicep rename to modules/Network/expressRouteCircuits/main.bicep diff --git a/modules/Microsoft.Network/expressRouteCircuits/version.json b/modules/Network/expressRouteCircuits/version.json similarity index 100% rename from modules/Microsoft.Network/expressRouteCircuits/version.json rename to modules/Network/expressRouteCircuits/version.json diff --git a/modules/Microsoft.Network/expressRouteGateway/.bicep/nested_roleAssignments.bicep b/modules/Network/expressRouteGateway/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/expressRouteGateway/.bicep/nested_roleAssignments.bicep rename to modules/Network/expressRouteGateway/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/expressRouteGateway/.test/common/dependencies.bicep b/modules/Network/expressRouteGateway/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/expressRouteGateway/.test/common/dependencies.bicep rename to modules/Network/expressRouteGateway/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/expressRouteGateway/.test/common/main.test.bicep b/modules/Network/expressRouteGateway/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/expressRouteGateway/.test/common/main.test.bicep rename to modules/Network/expressRouteGateway/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/expressRouteGateway/readme.md b/modules/Network/expressRouteGateway/README.md similarity index 100% rename from modules/Microsoft.Network/expressRouteGateway/readme.md rename to modules/Network/expressRouteGateway/README.md diff --git a/modules/Microsoft.Network/expressRouteGateway/main.bicep b/modules/Network/expressRouteGateway/main.bicep similarity index 100% rename from modules/Microsoft.Network/expressRouteGateway/main.bicep rename to modules/Network/expressRouteGateway/main.bicep diff --git a/modules/Microsoft.Network/expressRouteGateway/version.json b/modules/Network/expressRouteGateway/version.json similarity index 100% rename from modules/Microsoft.Network/expressRouteGateway/version.json rename to modules/Network/expressRouteGateway/version.json diff --git a/modules/Microsoft.Network/firewallPolicies/.test/common/main.test.bicep b/modules/Network/firewallPolicies/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/firewallPolicies/.test/common/main.test.bicep rename to modules/Network/firewallPolicies/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/firewallPolicies/.test/min/main.test.bicep b/modules/Network/firewallPolicies/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/firewallPolicies/.test/min/main.test.bicep rename to modules/Network/firewallPolicies/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/firewallPolicies/readme.md b/modules/Network/firewallPolicies/README.md similarity index 100% rename from modules/Microsoft.Network/firewallPolicies/readme.md rename to modules/Network/firewallPolicies/README.md diff --git a/modules/Microsoft.Network/firewallPolicies/main.bicep b/modules/Network/firewallPolicies/main.bicep similarity index 100% rename from modules/Microsoft.Network/firewallPolicies/main.bicep rename to modules/Network/firewallPolicies/main.bicep diff --git a/modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md b/modules/Network/firewallPolicies/ruleCollectionGroups/README.md similarity index 100% rename from modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md rename to modules/Network/firewallPolicies/ruleCollectionGroups/README.md diff --git a/modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/main.bicep b/modules/Network/firewallPolicies/ruleCollectionGroups/main.bicep similarity index 100% rename from modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/main.bicep rename to modules/Network/firewallPolicies/ruleCollectionGroups/main.bicep diff --git a/modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json b/modules/Network/firewallPolicies/ruleCollectionGroups/version.json similarity index 100% rename from modules/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json rename to modules/Network/firewallPolicies/ruleCollectionGroups/version.json diff --git a/modules/Microsoft.Network/firewallPolicies/version.json b/modules/Network/firewallPolicies/version.json similarity index 100% rename from modules/Microsoft.Network/firewallPolicies/version.json rename to modules/Network/firewallPolicies/version.json diff --git a/modules/Microsoft.Network/frontDoors/.bicep/nested_roleAssignments.bicep b/modules/Network/frontDoors/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/frontDoors/.bicep/nested_roleAssignments.bicep rename to modules/Network/frontDoors/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/frontDoors/.test/common/dependencies.bicep b/modules/Network/frontDoors/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/frontDoors/.test/common/dependencies.bicep rename to modules/Network/frontDoors/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/frontDoors/.test/common/main.test.bicep b/modules/Network/frontDoors/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/frontDoors/.test/common/main.test.bicep rename to modules/Network/frontDoors/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/frontDoors/.test/min/main.test.bicep b/modules/Network/frontDoors/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/frontDoors/.test/min/main.test.bicep rename to modules/Network/frontDoors/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/frontDoors/readme.md b/modules/Network/frontDoors/README.md similarity index 100% rename from modules/Microsoft.Network/frontDoors/readme.md rename to modules/Network/frontDoors/README.md diff --git a/modules/Microsoft.Network/frontDoors/main.bicep b/modules/Network/frontDoors/main.bicep similarity index 100% rename from modules/Microsoft.Network/frontDoors/main.bicep rename to modules/Network/frontDoors/main.bicep diff --git a/modules/Microsoft.Network/frontDoors/version.json b/modules/Network/frontDoors/version.json similarity index 100% rename from modules/Microsoft.Network/frontDoors/version.json rename to modules/Network/frontDoors/version.json diff --git a/modules/Microsoft.Network/ipGroups/.bicep/nested_roleAssignments.bicep b/modules/Network/ipGroups/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/ipGroups/.bicep/nested_roleAssignments.bicep rename to modules/Network/ipGroups/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/ipGroups/.test/common/dependencies.bicep b/modules/Network/ipGroups/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/ipGroups/.test/common/dependencies.bicep rename to modules/Network/ipGroups/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/ipGroups/.test/common/main.test.bicep b/modules/Network/ipGroups/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/ipGroups/.test/common/main.test.bicep rename to modules/Network/ipGroups/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/ipGroups/.test/min/main.test.bicep b/modules/Network/ipGroups/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/ipGroups/.test/min/main.test.bicep rename to modules/Network/ipGroups/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/ipGroups/readme.md b/modules/Network/ipGroups/README.md similarity index 100% rename from modules/Microsoft.Network/ipGroups/readme.md rename to modules/Network/ipGroups/README.md diff --git a/modules/Microsoft.Network/ipGroups/main.bicep b/modules/Network/ipGroups/main.bicep similarity index 100% rename from modules/Microsoft.Network/ipGroups/main.bicep rename to modules/Network/ipGroups/main.bicep diff --git a/modules/Microsoft.Network/ipGroups/version.json b/modules/Network/ipGroups/version.json similarity index 100% rename from modules/Microsoft.Network/ipGroups/version.json rename to modules/Network/ipGroups/version.json diff --git a/modules/Microsoft.Network/loadBalancers/.bicep/nested_roleAssignments.bicep b/modules/Network/loadBalancers/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/loadBalancers/.bicep/nested_roleAssignments.bicep rename to modules/Network/loadBalancers/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/loadBalancers/.test/common/dependencies.bicep b/modules/Network/loadBalancers/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/loadBalancers/.test/common/dependencies.bicep rename to modules/Network/loadBalancers/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/loadBalancers/.test/common/main.test.bicep b/modules/Network/loadBalancers/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/loadBalancers/.test/common/main.test.bicep rename to modules/Network/loadBalancers/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/loadBalancers/.test/internal/dependencies.bicep b/modules/Network/loadBalancers/.test/internal/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/loadBalancers/.test/internal/dependencies.bicep rename to modules/Network/loadBalancers/.test/internal/dependencies.bicep diff --git a/modules/Microsoft.Network/loadBalancers/.test/internal/main.test.bicep b/modules/Network/loadBalancers/.test/internal/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/loadBalancers/.test/internal/main.test.bicep rename to modules/Network/loadBalancers/.test/internal/main.test.bicep diff --git a/modules/Microsoft.Network/loadBalancers/.test/min/dependencies.bicep b/modules/Network/loadBalancers/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/loadBalancers/.test/min/dependencies.bicep rename to modules/Network/loadBalancers/.test/min/dependencies.bicep diff --git a/modules/Microsoft.Network/loadBalancers/.test/min/main.test.bicep b/modules/Network/loadBalancers/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/loadBalancers/.test/min/main.test.bicep rename to modules/Network/loadBalancers/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/loadBalancers/readme.md b/modules/Network/loadBalancers/README.md similarity index 100% rename from modules/Microsoft.Network/loadBalancers/readme.md rename to modules/Network/loadBalancers/README.md diff --git a/modules/Microsoft.Network/loadBalancers/backendAddressPools/readme.md b/modules/Network/loadBalancers/backendAddressPools/README.md similarity index 100% rename from modules/Microsoft.Network/loadBalancers/backendAddressPools/readme.md rename to modules/Network/loadBalancers/backendAddressPools/README.md diff --git a/modules/Microsoft.Network/loadBalancers/backendAddressPools/main.bicep b/modules/Network/loadBalancers/backendAddressPools/main.bicep similarity index 100% rename from modules/Microsoft.Network/loadBalancers/backendAddressPools/main.bicep rename to modules/Network/loadBalancers/backendAddressPools/main.bicep diff --git a/modules/Microsoft.Network/loadBalancers/backendAddressPools/version.json b/modules/Network/loadBalancers/backendAddressPools/version.json similarity index 100% rename from modules/Microsoft.Network/loadBalancers/backendAddressPools/version.json rename to modules/Network/loadBalancers/backendAddressPools/version.json diff --git a/modules/Microsoft.Network/loadBalancers/inboundNatRules/readme.md b/modules/Network/loadBalancers/inboundNatRules/README.md similarity index 100% rename from modules/Microsoft.Network/loadBalancers/inboundNatRules/readme.md rename to modules/Network/loadBalancers/inboundNatRules/README.md diff --git a/modules/Microsoft.Network/loadBalancers/inboundNatRules/main.bicep b/modules/Network/loadBalancers/inboundNatRules/main.bicep similarity index 100% rename from modules/Microsoft.Network/loadBalancers/inboundNatRules/main.bicep rename to modules/Network/loadBalancers/inboundNatRules/main.bicep diff --git a/modules/Microsoft.Network/loadBalancers/inboundNatRules/version.json b/modules/Network/loadBalancers/inboundNatRules/version.json similarity index 100% rename from modules/Microsoft.Network/loadBalancers/inboundNatRules/version.json rename to modules/Network/loadBalancers/inboundNatRules/version.json diff --git a/modules/Microsoft.Network/loadBalancers/main.bicep b/modules/Network/loadBalancers/main.bicep similarity index 100% rename from modules/Microsoft.Network/loadBalancers/main.bicep rename to modules/Network/loadBalancers/main.bicep diff --git a/modules/Microsoft.Network/loadBalancers/version.json b/modules/Network/loadBalancers/version.json similarity index 100% rename from modules/Microsoft.Network/loadBalancers/version.json rename to modules/Network/loadBalancers/version.json diff --git a/modules/Microsoft.Network/localNetworkGateways/.bicep/nested_roleAssignments.bicep b/modules/Network/localNetworkGateways/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/localNetworkGateways/.bicep/nested_roleAssignments.bicep rename to modules/Network/localNetworkGateways/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/localNetworkGateways/.test/common/dependencies.bicep b/modules/Network/localNetworkGateways/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/localNetworkGateways/.test/common/dependencies.bicep rename to modules/Network/localNetworkGateways/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/localNetworkGateways/.test/common/main.test.bicep b/modules/Network/localNetworkGateways/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/localNetworkGateways/.test/common/main.test.bicep rename to modules/Network/localNetworkGateways/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/localNetworkGateways/.test/min/main.test.bicep b/modules/Network/localNetworkGateways/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/localNetworkGateways/.test/min/main.test.bicep rename to modules/Network/localNetworkGateways/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/localNetworkGateways/readme.md b/modules/Network/localNetworkGateways/README.md similarity index 100% rename from modules/Microsoft.Network/localNetworkGateways/readme.md rename to modules/Network/localNetworkGateways/README.md diff --git a/modules/Microsoft.Network/localNetworkGateways/main.bicep b/modules/Network/localNetworkGateways/main.bicep similarity index 100% rename from modules/Microsoft.Network/localNetworkGateways/main.bicep rename to modules/Network/localNetworkGateways/main.bicep diff --git a/modules/Microsoft.Network/localNetworkGateways/version.json b/modules/Network/localNetworkGateways/version.json similarity index 100% rename from modules/Microsoft.Network/localNetworkGateways/version.json rename to modules/Network/localNetworkGateways/version.json diff --git a/modules/Microsoft.Network/natGateways/.bicep/nested_roleAssignments.bicep b/modules/Network/natGateways/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/natGateways/.bicep/nested_roleAssignments.bicep rename to modules/Network/natGateways/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/natGateways/.test/common/dependencies.bicep b/modules/Network/natGateways/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/natGateways/.test/common/dependencies.bicep rename to modules/Network/natGateways/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/natGateways/.test/common/main.test.bicep b/modules/Network/natGateways/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/natGateways/.test/common/main.test.bicep rename to modules/Network/natGateways/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/natGateways/readme.md b/modules/Network/natGateways/README.md similarity index 100% rename from modules/Microsoft.Network/natGateways/readme.md rename to modules/Network/natGateways/README.md diff --git a/modules/Microsoft.Network/natGateways/main.bicep b/modules/Network/natGateways/main.bicep similarity index 100% rename from modules/Microsoft.Network/natGateways/main.bicep rename to modules/Network/natGateways/main.bicep diff --git a/modules/Microsoft.Network/natGateways/version.json b/modules/Network/natGateways/version.json similarity index 100% rename from modules/Microsoft.Network/natGateways/version.json rename to modules/Network/natGateways/version.json diff --git a/modules/Microsoft.Network/networkInterfaces/.bicep/nested_roleAssignments.bicep b/modules/Network/networkInterfaces/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/networkInterfaces/.bicep/nested_roleAssignments.bicep rename to modules/Network/networkInterfaces/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/networkInterfaces/.test/common/dependencies.bicep b/modules/Network/networkInterfaces/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/networkInterfaces/.test/common/dependencies.bicep rename to modules/Network/networkInterfaces/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/networkInterfaces/.test/common/main.test.bicep b/modules/Network/networkInterfaces/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/networkInterfaces/.test/common/main.test.bicep rename to modules/Network/networkInterfaces/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/networkInterfaces/.test/min/dependencies.bicep b/modules/Network/networkInterfaces/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/networkInterfaces/.test/min/dependencies.bicep rename to modules/Network/networkInterfaces/.test/min/dependencies.bicep diff --git a/modules/Microsoft.Network/networkInterfaces/.test/min/main.test.bicep b/modules/Network/networkInterfaces/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/networkInterfaces/.test/min/main.test.bicep rename to modules/Network/networkInterfaces/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/networkInterfaces/readme.md b/modules/Network/networkInterfaces/README.md similarity index 100% rename from modules/Microsoft.Network/networkInterfaces/readme.md rename to modules/Network/networkInterfaces/README.md diff --git a/modules/Microsoft.Network/networkInterfaces/main.bicep b/modules/Network/networkInterfaces/main.bicep similarity index 100% rename from modules/Microsoft.Network/networkInterfaces/main.bicep rename to modules/Network/networkInterfaces/main.bicep diff --git a/modules/Microsoft.Network/networkInterfaces/version.json b/modules/Network/networkInterfaces/version.json similarity index 100% rename from modules/Microsoft.Network/networkInterfaces/version.json rename to modules/Network/networkInterfaces/version.json diff --git a/modules/Microsoft.Network/networkManagers/.bicep/nested_roleAssignments.bicep b/modules/Network/networkManagers/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/networkManagers/.bicep/nested_roleAssignments.bicep rename to modules/Network/networkManagers/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/networkManagers/.test/common/dependencies.bicep b/modules/Network/networkManagers/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/networkManagers/.test/common/dependencies.bicep rename to modules/Network/networkManagers/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/networkManagers/.test/common/main.test.bicep b/modules/Network/networkManagers/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/networkManagers/.test/common/main.test.bicep rename to modules/Network/networkManagers/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/networkManagers/readme.md b/modules/Network/networkManagers/README.md similarity index 100% rename from modules/Microsoft.Network/networkManagers/readme.md rename to modules/Network/networkManagers/README.md diff --git a/modules/Microsoft.Network/networkManagers/connectivityConfigurations/readme.md b/modules/Network/networkManagers/connectivityConfigurations/README.md similarity index 100% rename from modules/Microsoft.Network/networkManagers/connectivityConfigurations/readme.md rename to modules/Network/networkManagers/connectivityConfigurations/README.md diff --git a/modules/Microsoft.Network/networkManagers/connectivityConfigurations/main.bicep b/modules/Network/networkManagers/connectivityConfigurations/main.bicep similarity index 100% rename from modules/Microsoft.Network/networkManagers/connectivityConfigurations/main.bicep rename to modules/Network/networkManagers/connectivityConfigurations/main.bicep diff --git a/modules/Microsoft.Network/networkManagers/connectivityConfigurations/version.json b/modules/Network/networkManagers/connectivityConfigurations/version.json similarity index 100% rename from modules/Microsoft.Network/networkManagers/connectivityConfigurations/version.json rename to modules/Network/networkManagers/connectivityConfigurations/version.json diff --git a/modules/Microsoft.Network/networkManagers/main.bicep b/modules/Network/networkManagers/main.bicep similarity index 100% rename from modules/Microsoft.Network/networkManagers/main.bicep rename to modules/Network/networkManagers/main.bicep diff --git a/modules/Microsoft.Network/networkManagers/networkGroups/readme.md b/modules/Network/networkManagers/networkGroups/README.md similarity index 100% rename from modules/Microsoft.Network/networkManagers/networkGroups/readme.md rename to modules/Network/networkManagers/networkGroups/README.md diff --git a/modules/Microsoft.Network/networkManagers/networkGroups/main.bicep b/modules/Network/networkManagers/networkGroups/main.bicep similarity index 100% rename from modules/Microsoft.Network/networkManagers/networkGroups/main.bicep rename to modules/Network/networkManagers/networkGroups/main.bicep diff --git a/modules/Microsoft.Network/networkManagers/networkGroups/staticMembers/readme.md b/modules/Network/networkManagers/networkGroups/staticMembers/README.md similarity index 100% rename from modules/Microsoft.Network/networkManagers/networkGroups/staticMembers/readme.md rename to modules/Network/networkManagers/networkGroups/staticMembers/README.md diff --git a/modules/Microsoft.Network/networkManagers/networkGroups/staticMembers/main.bicep b/modules/Network/networkManagers/networkGroups/staticMembers/main.bicep similarity index 100% rename from modules/Microsoft.Network/networkManagers/networkGroups/staticMembers/main.bicep rename to modules/Network/networkManagers/networkGroups/staticMembers/main.bicep diff --git a/modules/Microsoft.Network/networkManagers/networkGroups/staticMembers/version.json b/modules/Network/networkManagers/networkGroups/staticMembers/version.json similarity index 100% rename from modules/Microsoft.Network/networkManagers/networkGroups/staticMembers/version.json rename to modules/Network/networkManagers/networkGroups/staticMembers/version.json diff --git a/modules/Microsoft.Network/networkManagers/networkGroups/version.json b/modules/Network/networkManagers/networkGroups/version.json similarity index 100% rename from modules/Microsoft.Network/networkManagers/networkGroups/version.json rename to modules/Network/networkManagers/networkGroups/version.json diff --git a/modules/Microsoft.Network/networkManagers/scopeConnections/readme.md b/modules/Network/networkManagers/scopeConnections/README.md similarity index 100% rename from modules/Microsoft.Network/networkManagers/scopeConnections/readme.md rename to modules/Network/networkManagers/scopeConnections/README.md diff --git a/modules/Microsoft.Network/networkManagers/scopeConnections/main.bicep b/modules/Network/networkManagers/scopeConnections/main.bicep similarity index 100% rename from modules/Microsoft.Network/networkManagers/scopeConnections/main.bicep rename to modules/Network/networkManagers/scopeConnections/main.bicep diff --git a/modules/Microsoft.Network/networkManagers/scopeConnections/version.json b/modules/Network/networkManagers/scopeConnections/version.json similarity index 100% rename from modules/Microsoft.Network/networkManagers/scopeConnections/version.json rename to modules/Network/networkManagers/scopeConnections/version.json diff --git a/modules/Microsoft.Network/networkManagers/securityAdminConfigurations/readme.md b/modules/Network/networkManagers/securityAdminConfigurations/README.md similarity index 100% rename from modules/Microsoft.Network/networkManagers/securityAdminConfigurations/readme.md rename to modules/Network/networkManagers/securityAdminConfigurations/README.md diff --git a/modules/Microsoft.Network/networkManagers/securityAdminConfigurations/main.bicep b/modules/Network/networkManagers/securityAdminConfigurations/main.bicep similarity index 100% rename from modules/Microsoft.Network/networkManagers/securityAdminConfigurations/main.bicep rename to modules/Network/networkManagers/securityAdminConfigurations/main.bicep diff --git a/modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/readme.md b/modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/README.md similarity index 100% rename from modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/readme.md rename to modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/README.md diff --git a/modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/main.bicep b/modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/main.bicep similarity index 100% rename from modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/main.bicep rename to modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/main.bicep diff --git a/modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/readme.md b/modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/README.md similarity index 100% rename from modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/readme.md rename to modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/README.md diff --git a/modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/main.bicep b/modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/main.bicep similarity index 100% rename from modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/main.bicep rename to modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/main.bicep diff --git a/modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/version.json b/modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/version.json similarity index 100% rename from modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/version.json rename to modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/rules/version.json diff --git a/modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/version.json b/modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/version.json similarity index 100% rename from modules/Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/version.json rename to modules/Network/networkManagers/securityAdminConfigurations/ruleCollections/version.json diff --git a/modules/Microsoft.Network/networkManagers/securityAdminConfigurations/version.json b/modules/Network/networkManagers/securityAdminConfigurations/version.json similarity index 100% rename from modules/Microsoft.Network/networkManagers/securityAdminConfigurations/version.json rename to modules/Network/networkManagers/securityAdminConfigurations/version.json diff --git a/modules/Microsoft.Network/networkManagers/version.json b/modules/Network/networkManagers/version.json similarity index 100% rename from modules/Microsoft.Network/networkManagers/version.json rename to modules/Network/networkManagers/version.json diff --git a/modules/Microsoft.Network/networkSecurityGroups/.bicep/nested_roleAssignments.bicep b/modules/Network/networkSecurityGroups/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/networkSecurityGroups/.bicep/nested_roleAssignments.bicep rename to modules/Network/networkSecurityGroups/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/networkSecurityGroups/.test/common/dependencies.bicep b/modules/Network/networkSecurityGroups/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/networkSecurityGroups/.test/common/dependencies.bicep rename to modules/Network/networkSecurityGroups/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/networkSecurityGroups/.test/common/main.test.bicep b/modules/Network/networkSecurityGroups/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/networkSecurityGroups/.test/common/main.test.bicep rename to modules/Network/networkSecurityGroups/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/networkSecurityGroups/.test/min/main.test.bicep b/modules/Network/networkSecurityGroups/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/networkSecurityGroups/.test/min/main.test.bicep rename to modules/Network/networkSecurityGroups/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/networkSecurityGroups/readme.md b/modules/Network/networkSecurityGroups/README.md similarity index 100% rename from modules/Microsoft.Network/networkSecurityGroups/readme.md rename to modules/Network/networkSecurityGroups/README.md diff --git a/modules/Microsoft.Network/networkSecurityGroups/main.bicep b/modules/Network/networkSecurityGroups/main.bicep similarity index 100% rename from modules/Microsoft.Network/networkSecurityGroups/main.bicep rename to modules/Network/networkSecurityGroups/main.bicep diff --git a/modules/Microsoft.Network/networkSecurityGroups/securityRules/readme.md b/modules/Network/networkSecurityGroups/securityRules/README.md similarity index 100% rename from modules/Microsoft.Network/networkSecurityGroups/securityRules/readme.md rename to modules/Network/networkSecurityGroups/securityRules/README.md diff --git a/modules/Microsoft.Network/networkSecurityGroups/securityRules/main.bicep b/modules/Network/networkSecurityGroups/securityRules/main.bicep similarity index 100% rename from modules/Microsoft.Network/networkSecurityGroups/securityRules/main.bicep rename to modules/Network/networkSecurityGroups/securityRules/main.bicep diff --git a/modules/Microsoft.Network/networkSecurityGroups/securityRules/version.json b/modules/Network/networkSecurityGroups/securityRules/version.json similarity index 100% rename from modules/Microsoft.Network/networkSecurityGroups/securityRules/version.json rename to modules/Network/networkSecurityGroups/securityRules/version.json diff --git a/modules/Microsoft.Network/networkSecurityGroups/version.json b/modules/Network/networkSecurityGroups/version.json similarity index 100% rename from modules/Microsoft.Network/networkSecurityGroups/version.json rename to modules/Network/networkSecurityGroups/version.json diff --git a/modules/Microsoft.Network/networkWatchers/.bicep/nested_roleAssignments.bicep b/modules/Network/networkWatchers/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/networkWatchers/.bicep/nested_roleAssignments.bicep rename to modules/Network/networkWatchers/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/networkWatchers/.test/common/dependencies.bicep b/modules/Network/networkWatchers/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/networkWatchers/.test/common/dependencies.bicep rename to modules/Network/networkWatchers/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/networkWatchers/.test/common/main.test.bicep b/modules/Network/networkWatchers/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/networkWatchers/.test/common/main.test.bicep rename to modules/Network/networkWatchers/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/networkWatchers/.test/min/main.test.bicep b/modules/Network/networkWatchers/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/networkWatchers/.test/min/main.test.bicep rename to modules/Network/networkWatchers/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/networkWatchers/readme.md b/modules/Network/networkWatchers/README.md similarity index 100% rename from modules/Microsoft.Network/networkWatchers/readme.md rename to modules/Network/networkWatchers/README.md diff --git a/modules/Microsoft.Network/networkWatchers/connectionMonitors/readme.md b/modules/Network/networkWatchers/connectionMonitors/README.md similarity index 100% rename from modules/Microsoft.Network/networkWatchers/connectionMonitors/readme.md rename to modules/Network/networkWatchers/connectionMonitors/README.md diff --git a/modules/Microsoft.Network/networkWatchers/connectionMonitors/main.bicep b/modules/Network/networkWatchers/connectionMonitors/main.bicep similarity index 100% rename from modules/Microsoft.Network/networkWatchers/connectionMonitors/main.bicep rename to modules/Network/networkWatchers/connectionMonitors/main.bicep diff --git a/modules/Microsoft.Network/networkWatchers/connectionMonitors/version.json b/modules/Network/networkWatchers/connectionMonitors/version.json similarity index 100% rename from modules/Microsoft.Network/networkWatchers/connectionMonitors/version.json rename to modules/Network/networkWatchers/connectionMonitors/version.json diff --git a/modules/Microsoft.Network/networkWatchers/flowLogs/readme.md b/modules/Network/networkWatchers/flowLogs/README.md similarity index 100% rename from modules/Microsoft.Network/networkWatchers/flowLogs/readme.md rename to modules/Network/networkWatchers/flowLogs/README.md diff --git a/modules/Microsoft.Network/networkWatchers/flowLogs/main.bicep b/modules/Network/networkWatchers/flowLogs/main.bicep similarity index 100% rename from modules/Microsoft.Network/networkWatchers/flowLogs/main.bicep rename to modules/Network/networkWatchers/flowLogs/main.bicep diff --git a/modules/Microsoft.Network/networkWatchers/flowLogs/version.json b/modules/Network/networkWatchers/flowLogs/version.json similarity index 100% rename from modules/Microsoft.Network/networkWatchers/flowLogs/version.json rename to modules/Network/networkWatchers/flowLogs/version.json diff --git a/modules/Microsoft.Network/networkWatchers/main.bicep b/modules/Network/networkWatchers/main.bicep similarity index 100% rename from modules/Microsoft.Network/networkWatchers/main.bicep rename to modules/Network/networkWatchers/main.bicep diff --git a/modules/Microsoft.Network/networkWatchers/version.json b/modules/Network/networkWatchers/version.json similarity index 100% rename from modules/Microsoft.Network/networkWatchers/version.json rename to modules/Network/networkWatchers/version.json diff --git a/modules/Microsoft.Network/privateDnsZones/.bicep/nested_roleAssignments.bicep b/modules/Network/privateDnsZones/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/.bicep/nested_roleAssignments.bicep rename to modules/Network/privateDnsZones/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/.test/common/dependencies.bicep b/modules/Network/privateDnsZones/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/.test/common/dependencies.bicep rename to modules/Network/privateDnsZones/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/.test/common/main.test.bicep b/modules/Network/privateDnsZones/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/.test/common/main.test.bicep rename to modules/Network/privateDnsZones/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/.test/min/main.test.bicep b/modules/Network/privateDnsZones/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/.test/min/main.test.bicep rename to modules/Network/privateDnsZones/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/A/.bicep/nested_roleAssignments.bicep b/modules/Network/privateDnsZones/A/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/A/.bicep/nested_roleAssignments.bicep rename to modules/Network/privateDnsZones/A/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/A/readme.md b/modules/Network/privateDnsZones/A/README.md similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/A/readme.md rename to modules/Network/privateDnsZones/A/README.md diff --git a/modules/Microsoft.Network/privateDnsZones/A/main.bicep b/modules/Network/privateDnsZones/A/main.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/A/main.bicep rename to modules/Network/privateDnsZones/A/main.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/A/version.json b/modules/Network/privateDnsZones/A/version.json similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/A/version.json rename to modules/Network/privateDnsZones/A/version.json diff --git a/modules/Microsoft.Network/privateDnsZones/AAAA/.bicep/nested_roleAssignments.bicep b/modules/Network/privateDnsZones/AAAA/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/AAAA/.bicep/nested_roleAssignments.bicep rename to modules/Network/privateDnsZones/AAAA/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/AAAA/readme.md b/modules/Network/privateDnsZones/AAAA/README.md similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/AAAA/readme.md rename to modules/Network/privateDnsZones/AAAA/README.md diff --git a/modules/Microsoft.Network/privateDnsZones/AAAA/main.bicep b/modules/Network/privateDnsZones/AAAA/main.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/AAAA/main.bicep rename to modules/Network/privateDnsZones/AAAA/main.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/AAAA/version.json b/modules/Network/privateDnsZones/AAAA/version.json similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/AAAA/version.json rename to modules/Network/privateDnsZones/AAAA/version.json diff --git a/modules/Microsoft.Network/privateDnsZones/CNAME/.bicep/nested_roleAssignments.bicep b/modules/Network/privateDnsZones/CNAME/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/CNAME/.bicep/nested_roleAssignments.bicep rename to modules/Network/privateDnsZones/CNAME/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/CNAME/readme.md b/modules/Network/privateDnsZones/CNAME/README.md similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/CNAME/readme.md rename to modules/Network/privateDnsZones/CNAME/README.md diff --git a/modules/Microsoft.Network/privateDnsZones/CNAME/main.bicep b/modules/Network/privateDnsZones/CNAME/main.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/CNAME/main.bicep rename to modules/Network/privateDnsZones/CNAME/main.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/CNAME/version.json b/modules/Network/privateDnsZones/CNAME/version.json similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/CNAME/version.json rename to modules/Network/privateDnsZones/CNAME/version.json diff --git a/modules/Microsoft.Network/privateDnsZones/MX/.bicep/nested_roleAssignments.bicep b/modules/Network/privateDnsZones/MX/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/MX/.bicep/nested_roleAssignments.bicep rename to modules/Network/privateDnsZones/MX/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/MX/readme.md b/modules/Network/privateDnsZones/MX/README.md similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/MX/readme.md rename to modules/Network/privateDnsZones/MX/README.md diff --git a/modules/Microsoft.Network/privateDnsZones/MX/main.bicep b/modules/Network/privateDnsZones/MX/main.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/MX/main.bicep rename to modules/Network/privateDnsZones/MX/main.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/MX/version.json b/modules/Network/privateDnsZones/MX/version.json similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/MX/version.json rename to modules/Network/privateDnsZones/MX/version.json diff --git a/modules/Microsoft.Network/privateDnsZones/PTR/.bicep/nested_roleAssignments.bicep b/modules/Network/privateDnsZones/PTR/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/PTR/.bicep/nested_roleAssignments.bicep rename to modules/Network/privateDnsZones/PTR/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/PTR/readme.md b/modules/Network/privateDnsZones/PTR/README.md similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/PTR/readme.md rename to modules/Network/privateDnsZones/PTR/README.md diff --git a/modules/Microsoft.Network/privateDnsZones/PTR/main.bicep b/modules/Network/privateDnsZones/PTR/main.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/PTR/main.bicep rename to modules/Network/privateDnsZones/PTR/main.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/PTR/version.json b/modules/Network/privateDnsZones/PTR/version.json similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/PTR/version.json rename to modules/Network/privateDnsZones/PTR/version.json diff --git a/modules/Microsoft.Network/privateDnsZones/readme.md b/modules/Network/privateDnsZones/README.md similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/readme.md rename to modules/Network/privateDnsZones/README.md diff --git a/modules/Microsoft.Network/privateDnsZones/SOA/.bicep/nested_roleAssignments.bicep b/modules/Network/privateDnsZones/SOA/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/SOA/.bicep/nested_roleAssignments.bicep rename to modules/Network/privateDnsZones/SOA/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/SOA/readme.md b/modules/Network/privateDnsZones/SOA/README.md similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/SOA/readme.md rename to modules/Network/privateDnsZones/SOA/README.md diff --git a/modules/Microsoft.Network/privateDnsZones/SOA/main.bicep b/modules/Network/privateDnsZones/SOA/main.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/SOA/main.bicep rename to modules/Network/privateDnsZones/SOA/main.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/SOA/version.json b/modules/Network/privateDnsZones/SOA/version.json similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/SOA/version.json rename to modules/Network/privateDnsZones/SOA/version.json diff --git a/modules/Microsoft.Network/privateDnsZones/SRV/.bicep/nested_roleAssignments.bicep b/modules/Network/privateDnsZones/SRV/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/SRV/.bicep/nested_roleAssignments.bicep rename to modules/Network/privateDnsZones/SRV/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/SRV/readme.md b/modules/Network/privateDnsZones/SRV/README.md similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/SRV/readme.md rename to modules/Network/privateDnsZones/SRV/README.md diff --git a/modules/Microsoft.Network/privateDnsZones/SRV/main.bicep b/modules/Network/privateDnsZones/SRV/main.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/SRV/main.bicep rename to modules/Network/privateDnsZones/SRV/main.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/SRV/version.json b/modules/Network/privateDnsZones/SRV/version.json similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/SRV/version.json rename to modules/Network/privateDnsZones/SRV/version.json diff --git a/modules/Microsoft.Network/privateDnsZones/TXT/.bicep/nested_roleAssignments.bicep b/modules/Network/privateDnsZones/TXT/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/TXT/.bicep/nested_roleAssignments.bicep rename to modules/Network/privateDnsZones/TXT/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/TXT/readme.md b/modules/Network/privateDnsZones/TXT/README.md similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/TXT/readme.md rename to modules/Network/privateDnsZones/TXT/README.md diff --git a/modules/Microsoft.Network/privateDnsZones/TXT/main.bicep b/modules/Network/privateDnsZones/TXT/main.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/TXT/main.bicep rename to modules/Network/privateDnsZones/TXT/main.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/TXT/version.json b/modules/Network/privateDnsZones/TXT/version.json similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/TXT/version.json rename to modules/Network/privateDnsZones/TXT/version.json diff --git a/modules/Microsoft.Network/privateDnsZones/main.bicep b/modules/Network/privateDnsZones/main.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/main.bicep rename to modules/Network/privateDnsZones/main.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/version.json b/modules/Network/privateDnsZones/version.json similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/version.json rename to modules/Network/privateDnsZones/version.json diff --git a/modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md b/modules/Network/privateDnsZones/virtualNetworkLinks/README.md similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md rename to modules/Network/privateDnsZones/virtualNetworkLinks/README.md diff --git a/modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/main.bicep b/modules/Network/privateDnsZones/virtualNetworkLinks/main.bicep similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/main.bicep rename to modules/Network/privateDnsZones/virtualNetworkLinks/main.bicep diff --git a/modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json b/modules/Network/privateDnsZones/virtualNetworkLinks/version.json similarity index 100% rename from modules/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json rename to modules/Network/privateDnsZones/virtualNetworkLinks/version.json diff --git a/modules/Microsoft.Network/privateEndpoints/.bicep/nested_roleAssignments.bicep b/modules/Network/privateEndpoints/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/privateEndpoints/.bicep/nested_roleAssignments.bicep rename to modules/Network/privateEndpoints/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/privateEndpoints/.test/common/dependencies.bicep b/modules/Network/privateEndpoints/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/privateEndpoints/.test/common/dependencies.bicep rename to modules/Network/privateEndpoints/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/privateEndpoints/.test/common/main.test.bicep b/modules/Network/privateEndpoints/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/privateEndpoints/.test/common/main.test.bicep rename to modules/Network/privateEndpoints/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/privateEndpoints/.test/min/dependencies.bicep b/modules/Network/privateEndpoints/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/privateEndpoints/.test/min/dependencies.bicep rename to modules/Network/privateEndpoints/.test/min/dependencies.bicep diff --git a/modules/Microsoft.Network/privateEndpoints/.test/min/main.test.bicep b/modules/Network/privateEndpoints/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/privateEndpoints/.test/min/main.test.bicep rename to modules/Network/privateEndpoints/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/privateEndpoints/readme.md b/modules/Network/privateEndpoints/README.md similarity index 100% rename from modules/Microsoft.Network/privateEndpoints/readme.md rename to modules/Network/privateEndpoints/README.md diff --git a/modules/Microsoft.Network/privateEndpoints/main.bicep b/modules/Network/privateEndpoints/main.bicep similarity index 100% rename from modules/Microsoft.Network/privateEndpoints/main.bicep rename to modules/Network/privateEndpoints/main.bicep diff --git a/modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md b/modules/Network/privateEndpoints/privateDnsZoneGroups/README.md similarity index 100% rename from modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md rename to modules/Network/privateEndpoints/privateDnsZoneGroups/README.md diff --git a/modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/main.bicep b/modules/Network/privateEndpoints/privateDnsZoneGroups/main.bicep similarity index 100% rename from modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/main.bicep rename to modules/Network/privateEndpoints/privateDnsZoneGroups/main.bicep diff --git a/modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json b/modules/Network/privateEndpoints/privateDnsZoneGroups/version.json similarity index 100% rename from modules/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json rename to modules/Network/privateEndpoints/privateDnsZoneGroups/version.json diff --git a/modules/Microsoft.Network/privateEndpoints/version.json b/modules/Network/privateEndpoints/version.json similarity index 100% rename from modules/Microsoft.Network/privateEndpoints/version.json rename to modules/Network/privateEndpoints/version.json diff --git a/modules/Microsoft.Network/privateLinkServices/.bicep/nested_roleAssignments.bicep b/modules/Network/privateLinkServices/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/privateLinkServices/.bicep/nested_roleAssignments.bicep rename to modules/Network/privateLinkServices/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/privateLinkServices/.test/common/dependencies.bicep b/modules/Network/privateLinkServices/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/privateLinkServices/.test/common/dependencies.bicep rename to modules/Network/privateLinkServices/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/privateLinkServices/.test/common/main.test.bicep b/modules/Network/privateLinkServices/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/privateLinkServices/.test/common/main.test.bicep rename to modules/Network/privateLinkServices/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/privateLinkServices/.test/min/dependencies.bicep b/modules/Network/privateLinkServices/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/privateLinkServices/.test/min/dependencies.bicep rename to modules/Network/privateLinkServices/.test/min/dependencies.bicep diff --git a/modules/Microsoft.Network/privateLinkServices/.test/min/main.test.bicep b/modules/Network/privateLinkServices/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/privateLinkServices/.test/min/main.test.bicep rename to modules/Network/privateLinkServices/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/privateLinkServices/readme.md b/modules/Network/privateLinkServices/README.md similarity index 100% rename from modules/Microsoft.Network/privateLinkServices/readme.md rename to modules/Network/privateLinkServices/README.md diff --git a/modules/Microsoft.Network/privateLinkServices/main.bicep b/modules/Network/privateLinkServices/main.bicep similarity index 100% rename from modules/Microsoft.Network/privateLinkServices/main.bicep rename to modules/Network/privateLinkServices/main.bicep diff --git a/modules/Microsoft.Network/privateLinkServices/version.json b/modules/Network/privateLinkServices/version.json similarity index 100% rename from modules/Microsoft.Network/privateLinkServices/version.json rename to modules/Network/privateLinkServices/version.json diff --git a/modules/Microsoft.Network/publicIPAddresses/.bicep/nested_roleAssignments.bicep b/modules/Network/publicIPAddresses/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/publicIPAddresses/.bicep/nested_roleAssignments.bicep rename to modules/Network/publicIPAddresses/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/publicIPAddresses/.test/common/dependencies.bicep b/modules/Network/publicIPAddresses/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/publicIPAddresses/.test/common/dependencies.bicep rename to modules/Network/publicIPAddresses/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/publicIPAddresses/.test/common/main.test.bicep b/modules/Network/publicIPAddresses/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/publicIPAddresses/.test/common/main.test.bicep rename to modules/Network/publicIPAddresses/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/publicIPAddresses/.test/min/main.test.bicep b/modules/Network/publicIPAddresses/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/publicIPAddresses/.test/min/main.test.bicep rename to modules/Network/publicIPAddresses/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/publicIPAddresses/readme.md b/modules/Network/publicIPAddresses/README.md similarity index 100% rename from modules/Microsoft.Network/publicIPAddresses/readme.md rename to modules/Network/publicIPAddresses/README.md diff --git a/modules/Microsoft.Network/publicIPAddresses/main.bicep b/modules/Network/publicIPAddresses/main.bicep similarity index 100% rename from modules/Microsoft.Network/publicIPAddresses/main.bicep rename to modules/Network/publicIPAddresses/main.bicep diff --git a/modules/Microsoft.Network/publicIPAddresses/version.json b/modules/Network/publicIPAddresses/version.json similarity index 100% rename from modules/Microsoft.Network/publicIPAddresses/version.json rename to modules/Network/publicIPAddresses/version.json diff --git a/modules/Microsoft.Network/publicIPPrefixes/.bicep/nested_roleAssignments.bicep b/modules/Network/publicIPPrefixes/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/publicIPPrefixes/.bicep/nested_roleAssignments.bicep rename to modules/Network/publicIPPrefixes/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/publicIPPrefixes/.test/common/dependencies.bicep b/modules/Network/publicIPPrefixes/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/publicIPPrefixes/.test/common/dependencies.bicep rename to modules/Network/publicIPPrefixes/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/publicIPPrefixes/.test/common/main.test.bicep b/modules/Network/publicIPPrefixes/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/publicIPPrefixes/.test/common/main.test.bicep rename to modules/Network/publicIPPrefixes/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/publicIPPrefixes/.test/min/main.test.bicep b/modules/Network/publicIPPrefixes/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/publicIPPrefixes/.test/min/main.test.bicep rename to modules/Network/publicIPPrefixes/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/publicIPPrefixes/readme.md b/modules/Network/publicIPPrefixes/README.md similarity index 100% rename from modules/Microsoft.Network/publicIPPrefixes/readme.md rename to modules/Network/publicIPPrefixes/README.md diff --git a/modules/Microsoft.Network/publicIPPrefixes/main.bicep b/modules/Network/publicIPPrefixes/main.bicep similarity index 100% rename from modules/Microsoft.Network/publicIPPrefixes/main.bicep rename to modules/Network/publicIPPrefixes/main.bicep diff --git a/modules/Microsoft.Network/publicIPPrefixes/version.json b/modules/Network/publicIPPrefixes/version.json similarity index 100% rename from modules/Microsoft.Network/publicIPPrefixes/version.json rename to modules/Network/publicIPPrefixes/version.json diff --git a/modules/Microsoft.Network/routeTables/.bicep/nested_roleAssignments.bicep b/modules/Network/routeTables/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/routeTables/.bicep/nested_roleAssignments.bicep rename to modules/Network/routeTables/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/routeTables/.test/common/dependencies.bicep b/modules/Network/routeTables/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/routeTables/.test/common/dependencies.bicep rename to modules/Network/routeTables/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/routeTables/.test/common/main.test.bicep b/modules/Network/routeTables/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/routeTables/.test/common/main.test.bicep rename to modules/Network/routeTables/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/routeTables/.test/min/main.test.bicep b/modules/Network/routeTables/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/routeTables/.test/min/main.test.bicep rename to modules/Network/routeTables/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/routeTables/readme.md b/modules/Network/routeTables/README.md similarity index 100% rename from modules/Microsoft.Network/routeTables/readme.md rename to modules/Network/routeTables/README.md diff --git a/modules/Microsoft.Network/routeTables/main.bicep b/modules/Network/routeTables/main.bicep similarity index 100% rename from modules/Microsoft.Network/routeTables/main.bicep rename to modules/Network/routeTables/main.bicep diff --git a/modules/Microsoft.Network/routeTables/version.json b/modules/Network/routeTables/version.json similarity index 100% rename from modules/Microsoft.Network/routeTables/version.json rename to modules/Network/routeTables/version.json diff --git a/modules/Microsoft.Network/trafficmanagerprofiles/.bicep/nested_roleAssignments.bicep b/modules/Network/trafficmanagerprofiles/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/trafficmanagerprofiles/.bicep/nested_roleAssignments.bicep rename to modules/Network/trafficmanagerprofiles/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/trafficmanagerprofiles/.test/common/dependencies.bicep b/modules/Network/trafficmanagerprofiles/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/trafficmanagerprofiles/.test/common/dependencies.bicep rename to modules/Network/trafficmanagerprofiles/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/trafficmanagerprofiles/.test/common/main.test.bicep b/modules/Network/trafficmanagerprofiles/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/trafficmanagerprofiles/.test/common/main.test.bicep rename to modules/Network/trafficmanagerprofiles/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/trafficmanagerprofiles/.test/min/main.test.bicep b/modules/Network/trafficmanagerprofiles/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/trafficmanagerprofiles/.test/min/main.test.bicep rename to modules/Network/trafficmanagerprofiles/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/trafficmanagerprofiles/readme.md b/modules/Network/trafficmanagerprofiles/README.md similarity index 100% rename from modules/Microsoft.Network/trafficmanagerprofiles/readme.md rename to modules/Network/trafficmanagerprofiles/README.md diff --git a/modules/Microsoft.Network/trafficmanagerprofiles/main.bicep b/modules/Network/trafficmanagerprofiles/main.bicep similarity index 100% rename from modules/Microsoft.Network/trafficmanagerprofiles/main.bicep rename to modules/Network/trafficmanagerprofiles/main.bicep diff --git a/modules/Microsoft.Network/trafficmanagerprofiles/version.json b/modules/Network/trafficmanagerprofiles/version.json similarity index 100% rename from modules/Microsoft.Network/trafficmanagerprofiles/version.json rename to modules/Network/trafficmanagerprofiles/version.json diff --git a/modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep b/modules/Network/virtualHubs/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/virtualHubs/.test/common/dependencies.bicep rename to modules/Network/virtualHubs/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/virtualHubs/.test/common/main.test.bicep b/modules/Network/virtualHubs/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/virtualHubs/.test/common/main.test.bicep rename to modules/Network/virtualHubs/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/virtualHubs/.test/min/dependencies.bicep b/modules/Network/virtualHubs/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/virtualHubs/.test/min/dependencies.bicep rename to modules/Network/virtualHubs/.test/min/dependencies.bicep diff --git a/modules/Microsoft.Network/virtualHubs/.test/min/main.test.bicep b/modules/Network/virtualHubs/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/virtualHubs/.test/min/main.test.bicep rename to modules/Network/virtualHubs/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/virtualHubs/readme.md b/modules/Network/virtualHubs/README.md similarity index 100% rename from modules/Microsoft.Network/virtualHubs/readme.md rename to modules/Network/virtualHubs/README.md diff --git a/modules/Microsoft.Network/virtualHubs/hubRouteTables/readme.md b/modules/Network/virtualHubs/hubRouteTables/README.md similarity index 100% rename from modules/Microsoft.Network/virtualHubs/hubRouteTables/readme.md rename to modules/Network/virtualHubs/hubRouteTables/README.md diff --git a/modules/Microsoft.Network/virtualHubs/hubRouteTables/main.bicep b/modules/Network/virtualHubs/hubRouteTables/main.bicep similarity index 100% rename from modules/Microsoft.Network/virtualHubs/hubRouteTables/main.bicep rename to modules/Network/virtualHubs/hubRouteTables/main.bicep diff --git a/modules/Microsoft.Network/virtualHubs/hubRouteTables/version.json b/modules/Network/virtualHubs/hubRouteTables/version.json similarity index 100% rename from modules/Microsoft.Network/virtualHubs/hubRouteTables/version.json rename to modules/Network/virtualHubs/hubRouteTables/version.json diff --git a/modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/readme.md b/modules/Network/virtualHubs/hubVirtualNetworkConnections/README.md similarity index 100% rename from modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/readme.md rename to modules/Network/virtualHubs/hubVirtualNetworkConnections/README.md diff --git a/modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/main.bicep b/modules/Network/virtualHubs/hubVirtualNetworkConnections/main.bicep similarity index 100% rename from modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/main.bicep rename to modules/Network/virtualHubs/hubVirtualNetworkConnections/main.bicep diff --git a/modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/version.json b/modules/Network/virtualHubs/hubVirtualNetworkConnections/version.json similarity index 100% rename from modules/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/version.json rename to modules/Network/virtualHubs/hubVirtualNetworkConnections/version.json diff --git a/modules/Microsoft.Network/virtualHubs/main.bicep b/modules/Network/virtualHubs/main.bicep similarity index 100% rename from modules/Microsoft.Network/virtualHubs/main.bicep rename to modules/Network/virtualHubs/main.bicep diff --git a/modules/Microsoft.Network/virtualHubs/version.json b/modules/Network/virtualHubs/version.json similarity index 100% rename from modules/Microsoft.Network/virtualHubs/version.json rename to modules/Network/virtualHubs/version.json diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.bicep/nested_roleAssignments.bicep b/modules/Network/virtualNetworkGateways/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/virtualNetworkGateways/.bicep/nested_roleAssignments.bicep rename to modules/Network/virtualNetworkGateways/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.test/aadvpn/dependencies.bicep b/modules/Network/virtualNetworkGateways/.test/aadvpn/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/virtualNetworkGateways/.test/aadvpn/dependencies.bicep rename to modules/Network/virtualNetworkGateways/.test/aadvpn/dependencies.bicep diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.test/aadvpn/main.test.bicep b/modules/Network/virtualNetworkGateways/.test/aadvpn/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/virtualNetworkGateways/.test/aadvpn/main.test.bicep rename to modules/Network/virtualNetworkGateways/.test/aadvpn/main.test.bicep diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.test/expressRoute/dependencies.bicep b/modules/Network/virtualNetworkGateways/.test/expressRoute/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/virtualNetworkGateways/.test/expressRoute/dependencies.bicep rename to modules/Network/virtualNetworkGateways/.test/expressRoute/dependencies.bicep diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.test/expressRoute/main.test.bicep b/modules/Network/virtualNetworkGateways/.test/expressRoute/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/virtualNetworkGateways/.test/expressRoute/main.test.bicep rename to modules/Network/virtualNetworkGateways/.test/expressRoute/main.test.bicep diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.test/vpn/dependencies.bicep b/modules/Network/virtualNetworkGateways/.test/vpn/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/virtualNetworkGateways/.test/vpn/dependencies.bicep rename to modules/Network/virtualNetworkGateways/.test/vpn/dependencies.bicep diff --git a/modules/Microsoft.Network/virtualNetworkGateways/.test/vpn/main.test.bicep b/modules/Network/virtualNetworkGateways/.test/vpn/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/virtualNetworkGateways/.test/vpn/main.test.bicep rename to modules/Network/virtualNetworkGateways/.test/vpn/main.test.bicep diff --git a/modules/Microsoft.Network/virtualNetworkGateways/readme.md b/modules/Network/virtualNetworkGateways/README.md similarity index 100% rename from modules/Microsoft.Network/virtualNetworkGateways/readme.md rename to modules/Network/virtualNetworkGateways/README.md diff --git a/modules/Microsoft.Network/virtualNetworkGateways/main.bicep b/modules/Network/virtualNetworkGateways/main.bicep similarity index 100% rename from modules/Microsoft.Network/virtualNetworkGateways/main.bicep rename to modules/Network/virtualNetworkGateways/main.bicep diff --git a/modules/Microsoft.Network/virtualNetworkGateways/natRules/readme.md b/modules/Network/virtualNetworkGateways/natRules/README.md similarity index 100% rename from modules/Microsoft.Network/virtualNetworkGateways/natRules/readme.md rename to modules/Network/virtualNetworkGateways/natRules/README.md diff --git a/modules/Microsoft.Network/virtualNetworkGateways/natRules/main.bicep b/modules/Network/virtualNetworkGateways/natRules/main.bicep similarity index 100% rename from modules/Microsoft.Network/virtualNetworkGateways/natRules/main.bicep rename to modules/Network/virtualNetworkGateways/natRules/main.bicep diff --git a/modules/Microsoft.Network/virtualNetworkGateways/natRules/version.json b/modules/Network/virtualNetworkGateways/natRules/version.json similarity index 100% rename from modules/Microsoft.Network/virtualNetworkGateways/natRules/version.json rename to modules/Network/virtualNetworkGateways/natRules/version.json diff --git a/modules/Microsoft.Network/virtualNetworkGateways/version.json b/modules/Network/virtualNetworkGateways/version.json similarity index 100% rename from modules/Microsoft.Network/virtualNetworkGateways/version.json rename to modules/Network/virtualNetworkGateways/version.json diff --git a/modules/Microsoft.Network/virtualNetworks/.bicep/nested_roleAssignments.bicep b/modules/Network/virtualNetworks/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/virtualNetworks/.bicep/nested_roleAssignments.bicep rename to modules/Network/virtualNetworks/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/virtualNetworks/.test/common/dependencies.bicep b/modules/Network/virtualNetworks/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/virtualNetworks/.test/common/dependencies.bicep rename to modules/Network/virtualNetworks/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/virtualNetworks/.test/common/main.test.bicep b/modules/Network/virtualNetworks/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/virtualNetworks/.test/common/main.test.bicep rename to modules/Network/virtualNetworks/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/virtualNetworks/.test/min/main.test.bicep b/modules/Network/virtualNetworks/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/virtualNetworks/.test/min/main.test.bicep rename to modules/Network/virtualNetworks/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/virtualNetworks/.test/vnetPeering/dependencies.bicep b/modules/Network/virtualNetworks/.test/vnetPeering/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/virtualNetworks/.test/vnetPeering/dependencies.bicep rename to modules/Network/virtualNetworks/.test/vnetPeering/dependencies.bicep diff --git a/modules/Microsoft.Network/virtualNetworks/.test/vnetPeering/main.test.bicep b/modules/Network/virtualNetworks/.test/vnetPeering/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/virtualNetworks/.test/vnetPeering/main.test.bicep rename to modules/Network/virtualNetworks/.test/vnetPeering/main.test.bicep diff --git a/modules/Microsoft.Network/virtualNetworks/readme.md b/modules/Network/virtualNetworks/README.md similarity index 100% rename from modules/Microsoft.Network/virtualNetworks/readme.md rename to modules/Network/virtualNetworks/README.md diff --git a/modules/Microsoft.Network/virtualNetworks/main.bicep b/modules/Network/virtualNetworks/main.bicep similarity index 100% rename from modules/Microsoft.Network/virtualNetworks/main.bicep rename to modules/Network/virtualNetworks/main.bicep diff --git a/modules/Microsoft.Network/virtualNetworks/subnets/.bicep/nested_roleAssignments.bicep b/modules/Network/virtualNetworks/subnets/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/virtualNetworks/subnets/.bicep/nested_roleAssignments.bicep rename to modules/Network/virtualNetworks/subnets/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/virtualNetworks/subnets/readme.md b/modules/Network/virtualNetworks/subnets/README.md similarity index 100% rename from modules/Microsoft.Network/virtualNetworks/subnets/readme.md rename to modules/Network/virtualNetworks/subnets/README.md diff --git a/modules/Microsoft.Network/virtualNetworks/subnets/main.bicep b/modules/Network/virtualNetworks/subnets/main.bicep similarity index 100% rename from modules/Microsoft.Network/virtualNetworks/subnets/main.bicep rename to modules/Network/virtualNetworks/subnets/main.bicep diff --git a/modules/Microsoft.Network/virtualNetworks/subnets/version.json b/modules/Network/virtualNetworks/subnets/version.json similarity index 100% rename from modules/Microsoft.Network/virtualNetworks/subnets/version.json rename to modules/Network/virtualNetworks/subnets/version.json diff --git a/modules/Microsoft.Network/virtualNetworks/version.json b/modules/Network/virtualNetworks/version.json similarity index 100% rename from modules/Microsoft.Network/virtualNetworks/version.json rename to modules/Network/virtualNetworks/version.json diff --git a/modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md b/modules/Network/virtualNetworks/virtualNetworkPeerings/README.md similarity index 100% rename from modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md rename to modules/Network/virtualNetworks/virtualNetworkPeerings/README.md diff --git a/modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/main.bicep b/modules/Network/virtualNetworks/virtualNetworkPeerings/main.bicep similarity index 100% rename from modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/main.bicep rename to modules/Network/virtualNetworks/virtualNetworkPeerings/main.bicep diff --git a/modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json b/modules/Network/virtualNetworks/virtualNetworkPeerings/version.json similarity index 100% rename from modules/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json rename to modules/Network/virtualNetworks/virtualNetworkPeerings/version.json diff --git a/modules/Microsoft.Network/virtualWans/.bicep/nested_roleAssignments.bicep b/modules/Network/virtualWans/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/virtualWans/.bicep/nested_roleAssignments.bicep rename to modules/Network/virtualWans/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/virtualWans/.test/common/dependencies.bicep b/modules/Network/virtualWans/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/virtualWans/.test/common/dependencies.bicep rename to modules/Network/virtualWans/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/virtualWans/.test/common/main.test.bicep b/modules/Network/virtualWans/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/virtualWans/.test/common/main.test.bicep rename to modules/Network/virtualWans/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/virtualWans/.test/min/main.test.bicep b/modules/Network/virtualWans/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/virtualWans/.test/min/main.test.bicep rename to modules/Network/virtualWans/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/virtualWans/readme.md b/modules/Network/virtualWans/README.md similarity index 100% rename from modules/Microsoft.Network/virtualWans/readme.md rename to modules/Network/virtualWans/README.md diff --git a/modules/Microsoft.Network/virtualWans/main.bicep b/modules/Network/virtualWans/main.bicep similarity index 100% rename from modules/Microsoft.Network/virtualWans/main.bicep rename to modules/Network/virtualWans/main.bicep diff --git a/modules/Microsoft.Network/virtualWans/version.json b/modules/Network/virtualWans/version.json similarity index 100% rename from modules/Microsoft.Network/virtualWans/version.json rename to modules/Network/virtualWans/version.json diff --git a/modules/Microsoft.Network/vpnGateways/.test/common/dependencies.bicep b/modules/Network/vpnGateways/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/vpnGateways/.test/common/dependencies.bicep rename to modules/Network/vpnGateways/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/vpnGateways/.test/common/main.test.bicep b/modules/Network/vpnGateways/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/vpnGateways/.test/common/main.test.bicep rename to modules/Network/vpnGateways/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/vpnGateways/.test/min/dependencies.bicep b/modules/Network/vpnGateways/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/vpnGateways/.test/min/dependencies.bicep rename to modules/Network/vpnGateways/.test/min/dependencies.bicep diff --git a/modules/Microsoft.Network/vpnGateways/.test/min/main.test.bicep b/modules/Network/vpnGateways/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/vpnGateways/.test/min/main.test.bicep rename to modules/Network/vpnGateways/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/vpnGateways/readme.md b/modules/Network/vpnGateways/README.md similarity index 100% rename from modules/Microsoft.Network/vpnGateways/readme.md rename to modules/Network/vpnGateways/README.md diff --git a/modules/Microsoft.Network/vpnGateways/connections/readme.md b/modules/Network/vpnGateways/connections/README.md similarity index 100% rename from modules/Microsoft.Network/vpnGateways/connections/readme.md rename to modules/Network/vpnGateways/connections/README.md diff --git a/modules/Microsoft.Network/vpnGateways/connections/main.bicep b/modules/Network/vpnGateways/connections/main.bicep similarity index 100% rename from modules/Microsoft.Network/vpnGateways/connections/main.bicep rename to modules/Network/vpnGateways/connections/main.bicep diff --git a/modules/Microsoft.Network/vpnGateways/connections/version.json b/modules/Network/vpnGateways/connections/version.json similarity index 100% rename from modules/Microsoft.Network/vpnGateways/connections/version.json rename to modules/Network/vpnGateways/connections/version.json diff --git a/modules/Microsoft.Network/vpnGateways/main.bicep b/modules/Network/vpnGateways/main.bicep similarity index 100% rename from modules/Microsoft.Network/vpnGateways/main.bicep rename to modules/Network/vpnGateways/main.bicep diff --git a/modules/Microsoft.Network/vpnGateways/natRules/readme.md b/modules/Network/vpnGateways/natRules/README.md similarity index 100% rename from modules/Microsoft.Network/vpnGateways/natRules/readme.md rename to modules/Network/vpnGateways/natRules/README.md diff --git a/modules/Microsoft.Network/vpnGateways/natRules/main.bicep b/modules/Network/vpnGateways/natRules/main.bicep similarity index 100% rename from modules/Microsoft.Network/vpnGateways/natRules/main.bicep rename to modules/Network/vpnGateways/natRules/main.bicep diff --git a/modules/Microsoft.Network/vpnGateways/natRules/version.json b/modules/Network/vpnGateways/natRules/version.json similarity index 100% rename from modules/Microsoft.Network/vpnGateways/natRules/version.json rename to modules/Network/vpnGateways/natRules/version.json diff --git a/modules/Microsoft.Network/vpnGateways/version.json b/modules/Network/vpnGateways/version.json similarity index 100% rename from modules/Microsoft.Network/vpnGateways/version.json rename to modules/Network/vpnGateways/version.json diff --git a/modules/Microsoft.Network/vpnSites/.bicep/nested_roleAssignments.bicep b/modules/Network/vpnSites/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Network/vpnSites/.bicep/nested_roleAssignments.bicep rename to modules/Network/vpnSites/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Network/vpnSites/.test/common/dependencies.bicep b/modules/Network/vpnSites/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/vpnSites/.test/common/dependencies.bicep rename to modules/Network/vpnSites/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Network/vpnSites/.test/common/main.test.bicep b/modules/Network/vpnSites/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/vpnSites/.test/common/main.test.bicep rename to modules/Network/vpnSites/.test/common/main.test.bicep diff --git a/modules/Microsoft.Network/vpnSites/.test/min/dependencies.bicep b/modules/Network/vpnSites/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.Network/vpnSites/.test/min/dependencies.bicep rename to modules/Network/vpnSites/.test/min/dependencies.bicep diff --git a/modules/Microsoft.Network/vpnSites/.test/min/main.test.bicep b/modules/Network/vpnSites/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Network/vpnSites/.test/min/main.test.bicep rename to modules/Network/vpnSites/.test/min/main.test.bicep diff --git a/modules/Microsoft.Network/vpnSites/readme.md b/modules/Network/vpnSites/README.md similarity index 100% rename from modules/Microsoft.Network/vpnSites/readme.md rename to modules/Network/vpnSites/README.md diff --git a/modules/Microsoft.Network/vpnSites/main.bicep b/modules/Network/vpnSites/main.bicep similarity index 100% rename from modules/Microsoft.Network/vpnSites/main.bicep rename to modules/Network/vpnSites/main.bicep diff --git a/modules/Microsoft.Network/vpnSites/version.json b/modules/Network/vpnSites/version.json similarity index 100% rename from modules/Microsoft.Network/vpnSites/version.json rename to modules/Network/vpnSites/version.json diff --git a/modules/Storage/storageAccounts/README.md b/modules/Storage/storageAccounts/README.md index 60b2f7b9ff..7672f13903 100644 --- a/modules/Storage/storageAccounts/README.md +++ b/modules/Storage/storageAccounts/README.md @@ -59,7 +59,7 @@ This module is used to deploy a storage account, with the ability to deploy 1 or | `allowedCopyScope` | string | `''` | `['', AAD, PrivateLink]` | Restrict copy to and from Storage Accounts within an AAD tenant or with Private Links to the same VNet. | | `allowSharedKeyAccess` | bool | `True` | | Indicates whether the storage account permits requests to be authorized with the account access key via Shared Key. If false, then all requests, including shared access signatures, must be authorized with Azure Active Directory (Azure AD). The default value is null, which is equivalent to true. | | `azureFilesIdentityBasedAuthentication` | object | `{object}` | | Provides the identity based authentication settings for Azure Files. | -| `blobServices` | _[blobServices](blobServices/readme.md)_ object | `{object}` | | Blob service and containers to deploy. | +| `blobServices` | _[blobServices](blobServices/README.md)_ object | `{object}` | | Blob service and containers to deploy. | | `cMKKeyName` | string | `''` | | The name of the customer managed key to use for encryption. Cannot be deployed together with the parameter 'systemAssignedIdentity' enabled. | | `cMKKeyVersion` | string | `''` | | The version of the customer managed key to reference for encryption. If not provided, latest is used. | | `customDomainName` | string | `''` | | Sets the custom domain name assigned to the storage account. Name is the CNAME source. | @@ -76,11 +76,11 @@ This module is used to deploy a storage account, with the ability to deploy 1 or | `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via a Globally Unique Identifier (GUID). | | `enableNfsV3` | bool | `False` | | If true, enables NFS 3.0 support for the storage account. Requires enableHierarchicalNamespace to be true. | | `enableSftp` | bool | `False` | | If true, enables Secure File Transfer Protocol for the storage account. Requires enableHierarchicalNamespace to be true. | -| `fileServices` | _[fileServices](fileServices/readme.md)_ object | `{object}` | | File service and shares to deploy. | +| `fileServices` | _[fileServices](fileServices/README.md)_ object | `{object}` | | File service and shares to deploy. | | `isLocalUserEnabled` | bool | `False` | | Enables local users feature, if set to true. | | `kind` | string | `'StorageV2'` | `[BlobStorage, BlockBlobStorage, FileStorage, Storage, StorageV2]` | Type of Storage Account to create. | | `largeFileSharesState` | string | `'Disabled'` | `[Disabled, Enabled]` | Allow large file shares if sets to 'Enabled'. It cannot be disabled once it is enabled. Only supported on locally redundant and zone redundant file shares. It cannot be set on FileStorage storage accounts (storage accounts for premium file shares). | -| `localUsers` | _[localUsers](localUsers/readme.md)_ array | `[]` | | Local users to deploy for SFTP authentication. | +| `localUsers` | _[localUsers](localUsers/README.md)_ array | `[]` | | Local users to deploy for SFTP authentication. | | `location` | string | `[resourceGroup().location]` | | Location for all resources. | | `lock` | string | `''` | `['', CanNotDelete, ReadOnly]` | Specify the type of lock. | | `managementPolicyRules` | array | `[]` | | The Storage Account ManagementPolicies Rules. | @@ -88,14 +88,14 @@ This module is used to deploy a storage account, with the ability to deploy 1 or | `networkAcls` | object | `{object}` | | Networks ACLs, this value contains IPs to whitelist and/or Subnet information. For security reasons, it is recommended to set the DefaultAction Deny. | | `privateEndpoints` | array | `[]` | | Configuration details for private endpoints. For security reasons, it is recommended to use private endpoints whenever possible. | | `publicNetworkAccess` | string | `''` | `['', Disabled, Enabled]` | Whether or not public network access is allowed for this resource. For security reasons it should be disabled. If not specified, it will be disabled by default if private endpoints are set and networkAcls are not set. | -| `queueServices` | _[queueServices](queueServices/readme.md)_ object | `{object}` | | Queue service and queues to create. | +| `queueServices` | _[queueServices](queueServices/README.md)_ object | `{object}` | | Queue service and queues to create. | | `requireInfrastructureEncryption` | bool | `True` | | A Boolean indicating whether or not the service applies a secondary layer of encryption with platform managed keys for data at rest. For security reasons, it is recommended to set it to true. | | `roleAssignments` | array | `[]` | | Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'. | | `sasExpirationPeriod` | string | `''` | | The SAS expiration period. DD.HH:MM:SS. | | `skuName` | string | `'Standard_GRS'` | `[Premium_LRS, Premium_ZRS, Standard_GRS, Standard_GZRS, Standard_LRS, Standard_RAGRS, Standard_RAGZRS, Standard_ZRS]` | Storage Account Sku Name. | | `supportsHttpsTrafficOnly` | bool | `True` | | Allows HTTPS traffic only to storage service if sets to true. | | `systemAssignedIdentity` | bool | `False` | | Enables system assigned managed identity on the resource. | -| `tableServices` | _[tableServices](tableServices/readme.md)_ object | `{object}` | | Table service and tables to create. | +| `tableServices` | _[tableServices](tableServices/README.md)_ object | `{object}` | | Table service and tables to create. | | `tags` | object | `{object}` | | Tags of the resource. | | `userAssignedIdentities` | object | `{object}` | | The ID(s) to assign to the resource. | @@ -406,11 +406,7 @@ The hierarchical namespace of the storage account (see parameter `enableHierarch ## Cross-referenced modules -This section gives you an overview of all local-referenced module files (i.e., other CARML modules that are referenced in this module) and all remote-referenced files (i.e., Bicep modules that are referenced from a Bicep Registry or Template Specs). - -| Reference | Type | -| :-- | :-- | -| `Microsoft.Network/privateEndpoints` | Local reference | +_None_ ## Deployment examples @@ -426,7 +422,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module storageAccounts './Microsoft.Storage/storageAccounts/main.bicep' = { +module storageAccounts './Storage/storageAccounts/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ssacom' params: { // Required parameters @@ -889,7 +885,7 @@ module storageAccounts './Microsoft.Storage/storageAccounts/main.bicep' = { via Bicep module ```bicep -module storageAccounts './Microsoft.Storage/storageAccounts/main.bicep' = { +module storageAccounts './Storage/storageAccounts/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ssaencr' params: { // Required parameters @@ -1056,7 +1052,7 @@ module storageAccounts './Microsoft.Storage/storageAccounts/main.bicep' = { via Bicep module ```bicep -module storageAccounts './Microsoft.Storage/storageAccounts/main.bicep' = { +module storageAccounts './Storage/storageAccounts/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ssamin' params: { // Required parameters @@ -1105,7 +1101,7 @@ module storageAccounts './Microsoft.Storage/storageAccounts/main.bicep' = { via Bicep module ```bicep -module storageAccounts './Microsoft.Storage/storageAccounts/main.bicep' = { +module storageAccounts './Storage/storageAccounts/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ssanfs' params: { // Required parameters @@ -1250,7 +1246,7 @@ module storageAccounts './Microsoft.Storage/storageAccounts/main.bicep' = { via Bicep module ```bicep -module storageAccounts './Microsoft.Storage/storageAccounts/main.bicep' = { +module storageAccounts './Storage/storageAccounts/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ssav1' params: { // Required parameters diff --git a/modules/Storage/storageAccounts/blobServices/README.md b/modules/Storage/storageAccounts/blobServices/README.md index bc7eb99d25..6eb3349748 100644 --- a/modules/Storage/storageAccounts/blobServices/README.md +++ b/modules/Storage/storageAccounts/blobServices/README.md @@ -37,7 +37,7 @@ This module can be used to deploy a blob service into a storage account. | `containerDeleteRetentionPolicyAllowPermanentDelete` | bool | `False` | | This property when set to true allows deletion of the soft deleted blob versions and snapshots. This property cannot be used blob restore policy. This property only applies to blob service and does not apply to containers or file share. | | `containerDeleteRetentionPolicyDays` | int | `7` | | Indicates the number of days that the deleted item should be retained. | | `containerDeleteRetentionPolicyEnabled` | bool | `True` | | The blob service properties for container soft delete. Indicates whether DeleteRetentionPolicy is enabled. | -| `containers` | _[containers](containers/readme.md)_ array | `[]` | | Blob containers to create. | +| `containers` | _[containers](containers/README.md)_ array | `[]` | | Blob containers to create. | | `corsRules` | array | `[]` | | Specifies CORS rules for the Blob service. You can include up to five CorsRule elements in the request. If no CorsRule elements are included in the request body, all CORS rules will be deleted, and CORS will be disabled for the Blob service. | | `defaultServiceVersion` | string | `''` | | Indicates the default version to use for requests to the Blob service if an incoming request's version is not specified. Possible values include version 2008-10-27 and all more recent versions. | | `deleteRetentionPolicyDays` | int | `7` | | Indicates the number of days that the deleted blob should be retained. | diff --git a/modules/Storage/storageAccounts/fileServices/README.md b/modules/Storage/storageAccounts/fileServices/README.md index 81d88f5caa..871de36e69 100644 --- a/modules/Storage/storageAccounts/fileServices/README.md +++ b/modules/Storage/storageAccounts/fileServices/README.md @@ -42,7 +42,7 @@ This module can be used to deploy a file share service into a storage account. | `name` | string | `'default'` | | The name of the file service. | | `protocolSettings` | object | `{object}` | | Protocol settings for file service. | | `shareDeleteRetentionPolicy` | object | `{object}` | | The service properties for soft delete. | -| `shares` | _[shares](shares/readme.md)_ array | `[]` | | File shares to create. | +| `shares` | _[shares](shares/README.md)_ array | `[]` | | File shares to create. | ## Outputs diff --git a/modules/Storage/storageAccounts/main.bicep b/modules/Storage/storageAccounts/main.bicep index bf7a2d1fa0..1ccb0d437f 100644 --- a/modules/Storage/storageAccounts/main.bicep +++ b/modules/Storage/storageAccounts/main.bicep @@ -345,7 +345,7 @@ module storageAccount_roleAssignments '.bicep/nested_roleAssignments.bicep' = [f } }] -module storageAccount_privateEndpoints '../../Microsoft.Network/privateEndpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module storageAccount_privateEndpoints '../Network/privateEndpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-StorageAccount-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/Storage/storageAccounts/queueServices/README.md b/modules/Storage/storageAccounts/queueServices/README.md index f52d046715..120a745c41 100644 --- a/modules/Storage/storageAccounts/queueServices/README.md +++ b/modules/Storage/storageAccounts/queueServices/README.md @@ -39,7 +39,7 @@ This module can be used to deploy a file share service into a storage account. | `diagnosticStorageAccountId` | string | `''` | | Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | `''` | | Resource ID of a log analytics workspace. | | `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via a Globally Unique Identifier (GUID). | -| `queues` | _[queues](queues/readme.md)_ array | `[]` | | Queues to create. | +| `queues` | _[queues](queues/README.md)_ array | `[]` | | Queues to create. | ## Outputs diff --git a/modules/Storage/storageAccounts/tableServices/README.md b/modules/Storage/storageAccounts/tableServices/README.md index 80cd29627b..0e70e1add7 100644 --- a/modules/Storage/storageAccounts/tableServices/README.md +++ b/modules/Storage/storageAccounts/tableServices/README.md @@ -38,7 +38,7 @@ This module deploys a storage account table service | `diagnosticStorageAccountId` | string | `''` | | Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | `''` | | Resource ID of a log analytics workspace. | | `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via a Globally Unique Identifier (GUID). | -| `tables` | _[tables](tables/readme.md)_ array | `[]` | | tables to create. | +| `tables` | _[tables](tables/README.md)_ array | `[]` | | tables to create. | ## Outputs From f00658860f4adc19a32d0635e008e49dcac35d1b Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 18:30:16 +0200 Subject: [PATCH 36/63] network module ref --- modules/Storage/storageAccounts/main.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Storage/storageAccounts/main.bicep b/modules/Storage/storageAccounts/main.bicep index 1ccb0d437f..e152357fa9 100644 --- a/modules/Storage/storageAccounts/main.bicep +++ b/modules/Storage/storageAccounts/main.bicep @@ -345,7 +345,7 @@ module storageAccount_roleAssignments '.bicep/nested_roleAssignments.bicep' = [f } }] -module storageAccount_privateEndpoints '../Network/privateEndpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module storageAccount_privateEndpoints '../../Network/privateEndpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-StorageAccount-PrivateEndpoint-${index}' params: { groupIds: [ From 76e103f0cad940bbd124286792a4f4c56fc4970f Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 18:33:33 +0200 Subject: [PATCH 37/63] pester cleanup --- .../pipelines/staticValidation/module.tests.ps1 | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/utilities/pipelines/staticValidation/module.tests.ps1 b/utilities/pipelines/staticValidation/module.tests.ps1 index f19b549a45..4ef4a45457 100644 --- a/utilities/pipelines/staticValidation/module.tests.ps1 +++ b/utilities/pipelines/staticValidation/module.tests.ps1 @@ -657,13 +657,6 @@ Describe 'Readme tests' -Tag 'Readme' { [string] $readMeFilePath ) - # TODO Remove beginning - Write-Verbose ("moduleFolderName: $moduleFolderName") -Verbose - Write-Verbose ("templateFilePath: $templateFilePath") -Verbose - Write-Verbose ("readMeFilePath: $readMeFilePath") -Verbose - Write-Verbose ("repoRootPath: $repoRootPath") -Verbose - # TODO Remove end - # Get current hash $fileHashBefore = (Get-FileHash $readMeFilePath).Hash @@ -671,17 +664,11 @@ Describe 'Readme tests' -Tag 'Readme' { . (Join-Path $repoRootPath 'utilities' 'tools' 'Set-ModuleReadMe.ps1') # Apply update with already compiled template content - Set-ModuleReadMe -TemplateFilePath $templateFilePath - # -TemplateFileContent $templateContent + Set-ModuleReadMe -TemplateFilePath $templateFilePath -TemplateFileContent $templateContent # Get hash after 'update' $fileHashAfter = (Get-FileHash $readMeFilePath).Hash - # TODO Remove beginning - Write-Verbose ("fileHashBefore: $fileHashBefore") -Verbose - Write-Verbose ("fileHashAfter: $fileHashAfter") -Verbose - # TODO Remove end - # Compare $filesAreTheSame = $fileHashBefore -eq $fileHashAfter if (-not $filesAreTheSame) { From 96bd72d86fd4154fc89030790e95cd8c12927520 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 20:20:16 +0200 Subject: [PATCH 38/63] authorization namespace --- .../locks/.test/common/main.test.bicep | 0 .../locks/readme.md => Authorization/locks/README.md} | 0 .../{Microsoft.Authorization => Authorization}/locks/main.bicep | 0 .../readme.md => Authorization/locks/resourceGroup/README.md} | 0 .../locks/resourceGroup/main.bicep | 0 .../locks/resourceGroup/version.json | 0 .../readme.md => Authorization/locks/subscription/README.md} | 0 .../locks/subscription/main.bicep | 0 .../locks/subscription/version.json | 0 .../{Microsoft.Authorization => Authorization}/locks/version.json | 0 .../policyAssignments/.test/mg.common/main.test.bicep | 0 .../policyAssignments/.test/mg.min/main.test.bicep | 0 .../policyAssignments/.test/rg.common/dependencies.bicep | 0 .../policyAssignments/.test/rg.common/main.test.bicep | 0 .../policyAssignments/.test/rg.min/main.test.bicep | 0 .../policyAssignments/.test/sub.common/dependencies.bicep | 0 .../policyAssignments/.test/sub.common/main.test.bicep | 0 .../policyAssignments/.test/sub.min/main.test.bicep | 0 .../readme.md => Authorization/policyAssignments/README.md} | 0 .../policyAssignments/main.bicep | 0 .../policyAssignments/managementGroup/README.md} | 0 .../policyAssignments/managementGroup/main.bicep | 0 .../policyAssignments/managementGroup/version.json | 0 .../policyAssignments/resourceGroup/README.md} | 0 .../policyAssignments/resourceGroup/main.bicep | 0 .../policyAssignments/resourceGroup/version.json | 0 .../policyAssignments/subscription/README.md} | 0 .../policyAssignments/subscription/main.bicep | 0 .../policyAssignments/subscription/version.json | 0 .../policyAssignments/version.json | 0 .../policyDefinitions/.test/mg.common/main.test.bicep | 0 .../policyDefinitions/.test/mg.min/main.test.bicep | 0 .../policyDefinitions/.test/sub.common/main.test.bicep | 0 .../policyDefinitions/.test/sub.min/main.test.bicep | 0 .../readme.md => Authorization/policyDefinitions/README.md} | 0 .../policyDefinitions/main.bicep | 0 .../policyDefinitions/managementGroup/README.md} | 0 .../policyDefinitions/managementGroup/main.bicep | 0 .../policyDefinitions/managementGroup/version.json | 0 .../policyDefinitions/subscription/README.md} | 0 .../policyDefinitions/subscription/main.bicep | 0 .../policyDefinitions/subscription/version.json | 0 .../policyDefinitions/version.json | 0 .../policyExemptions/.test/mg.common/main.test.bicep | 0 .../policyExemptions/.test/mg.min/main.test.bicep | 0 .../policyExemptions/.test/rg.common/main.test.bicep | 0 .../policyExemptions/.test/rg.min/main.test.bicep | 0 .../policyExemptions/.test/sub.common/main.test.bicep | 0 .../policyExemptions/.test/sub.min/main.test.bicep | 0 .../readme.md => Authorization/policyExemptions/README.md} | 0 .../policyExemptions/main.bicep | 0 .../policyExemptions/managementGroup/README.md} | 0 .../policyExemptions/managementGroup/main.bicep | 0 .../policyExemptions/managementGroup/version.json | 0 .../policyExemptions/resourceGroup/README.md} | 0 .../policyExemptions/resourceGroup/main.bicep | 0 .../policyExemptions/resourceGroup/version.json | 0 .../policyExemptions/subscription/README.md} | 0 .../policyExemptions/subscription/main.bicep | 0 .../policyExemptions/subscription/version.json | 0 .../policyExemptions/version.json | 0 .../policySetDefinitions/.test/mg.common/main.test.bicep | 0 .../policySetDefinitions/.test/mg.min/main.test.bicep | 0 .../policySetDefinitions/.test/sub.common/main.test.bicep | 0 .../policySetDefinitions/.test/sub.min/main.test.bicep | 0 .../readme.md => Authorization/policySetDefinitions/README.md} | 0 .../policySetDefinitions/main.bicep | 0 .../policySetDefinitions/managementGroup/README.md} | 0 .../policySetDefinitions/managementGroup/main.bicep | 0 .../policySetDefinitions/managementGroup/version.json | 0 .../policySetDefinitions/subscription/README.md} | 0 .../policySetDefinitions/subscription/main.bicep | 0 .../policySetDefinitions/subscription/version.json | 0 .../policySetDefinitions/version.json | 0 .../roleAssignments/.test/mg.common/dependencies.bicep | 0 .../roleAssignments/.test/mg.common/interim.dependencies.bicep | 0 .../roleAssignments/.test/mg.common/main.test.bicep | 0 .../roleAssignments/.test/mg.min/dependencies.bicep | 0 .../roleAssignments/.test/mg.min/interim.dependencies.bicep | 0 .../roleAssignments/.test/mg.min/main.test.bicep | 0 .../roleAssignments/.test/rg.common/dependencies.bicep | 0 .../roleAssignments/.test/rg.common/main.test.bicep | 0 .../roleAssignments/.test/rg.min/dependencies.bicep | 0 .../roleAssignments/.test/rg.min/main.test.bicep | 0 .../roleAssignments/.test/sub.common/dependencies.bicep | 0 .../roleAssignments/.test/sub.common/main.test.bicep | 0 .../roleAssignments/.test/sub.min/dependencies.bicep | 0 .../roleAssignments/.test/sub.min/main.test.bicep | 0 .../readme.md => Authorization/roleAssignments/README.md} | 0 .../roleAssignments/main.bicep | 0 .../roleAssignments/managementGroup/README.md} | 0 .../roleAssignments/managementGroup/main.bicep | 0 .../roleAssignments/managementGroup/version.json | 0 .../roleAssignments/resourceGroup/README.md} | 0 .../roleAssignments/resourceGroup/main.bicep | 0 .../roleAssignments/resourceGroup/version.json | 0 .../roleAssignments/subscription/README.md} | 0 .../roleAssignments/subscription/main.bicep | 0 .../roleAssignments/subscription/version.json | 0 .../roleAssignments/version.json | 0 .../roleDefinitions/.test/mg.common/main.test.bicep | 0 .../roleDefinitions/.test/mg.min/main.test.bicep | 0 .../roleDefinitions/.test/rg.common/main.test.bicep | 0 .../roleDefinitions/.test/rg.min/main.test.bicep | 0 .../roleDefinitions/.test/sub.common/main.test.bicep | 0 .../roleDefinitions/.test/sub.min/main.test.bicep | 0 .../readme.md => Authorization/roleDefinitions/README.md} | 0 .../roleDefinitions/main.bicep | 0 .../roleDefinitions/managementGroup/README.md} | 0 .../roleDefinitions/managementGroup/main.bicep | 0 .../roleDefinitions/managementGroup/version.json | 0 .../roleDefinitions/resourceGroup/README.md} | 0 .../roleDefinitions/resourceGroup/main.bicep | 0 .../roleDefinitions/resourceGroup/version.json | 0 .../roleDefinitions/subscription/README.md} | 0 .../roleDefinitions/subscription/main.bicep | 0 .../roleDefinitions/subscription/version.json | 0 .../roleDefinitions/version.json | 0 118 files changed, 0 insertions(+), 0 deletions(-) rename modules/{Microsoft.Authorization => Authorization}/locks/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Authorization/locks/readme.md => Authorization/locks/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/locks/main.bicep (100%) rename modules/{Microsoft.Authorization/locks/resourceGroup/readme.md => Authorization/locks/resourceGroup/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/locks/resourceGroup/main.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/locks/resourceGroup/version.json (100%) rename modules/{Microsoft.Authorization/locks/subscription/readme.md => Authorization/locks/subscription/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/locks/subscription/main.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/locks/subscription/version.json (100%) rename modules/{Microsoft.Authorization => Authorization}/locks/version.json (100%) rename modules/{Microsoft.Authorization => Authorization}/policyAssignments/.test/mg.common/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyAssignments/.test/mg.min/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyAssignments/.test/rg.common/dependencies.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyAssignments/.test/rg.common/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyAssignments/.test/rg.min/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyAssignments/.test/sub.common/dependencies.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyAssignments/.test/sub.common/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyAssignments/.test/sub.min/main.test.bicep (100%) rename modules/{Microsoft.Authorization/policyAssignments/readme.md => Authorization/policyAssignments/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/policyAssignments/main.bicep (100%) rename modules/{Microsoft.Authorization/policyAssignments/managementGroup/readme.md => Authorization/policyAssignments/managementGroup/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/policyAssignments/managementGroup/main.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyAssignments/managementGroup/version.json (100%) rename modules/{Microsoft.Authorization/policyAssignments/resourceGroup/readme.md => Authorization/policyAssignments/resourceGroup/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/policyAssignments/resourceGroup/main.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyAssignments/resourceGroup/version.json (100%) rename modules/{Microsoft.Authorization/policyAssignments/subscription/readme.md => Authorization/policyAssignments/subscription/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/policyAssignments/subscription/main.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyAssignments/subscription/version.json (100%) rename modules/{Microsoft.Authorization => Authorization}/policyAssignments/version.json (100%) rename modules/{Microsoft.Authorization => Authorization}/policyDefinitions/.test/mg.common/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyDefinitions/.test/mg.min/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyDefinitions/.test/sub.common/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyDefinitions/.test/sub.min/main.test.bicep (100%) rename modules/{Microsoft.Authorization/policyDefinitions/readme.md => Authorization/policyDefinitions/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/policyDefinitions/main.bicep (100%) rename modules/{Microsoft.Authorization/policyDefinitions/managementGroup/readme.md => Authorization/policyDefinitions/managementGroup/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/policyDefinitions/managementGroup/main.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyDefinitions/managementGroup/version.json (100%) rename modules/{Microsoft.Authorization/policyDefinitions/subscription/readme.md => Authorization/policyDefinitions/subscription/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/policyDefinitions/subscription/main.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyDefinitions/subscription/version.json (100%) rename modules/{Microsoft.Authorization => Authorization}/policyDefinitions/version.json (100%) rename modules/{Microsoft.Authorization => Authorization}/policyExemptions/.test/mg.common/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyExemptions/.test/mg.min/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyExemptions/.test/rg.common/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyExemptions/.test/rg.min/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyExemptions/.test/sub.common/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyExemptions/.test/sub.min/main.test.bicep (100%) rename modules/{Microsoft.Authorization/policyExemptions/readme.md => Authorization/policyExemptions/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/policyExemptions/main.bicep (100%) rename modules/{Microsoft.Authorization/policyExemptions/managementGroup/readme.md => Authorization/policyExemptions/managementGroup/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/policyExemptions/managementGroup/main.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyExemptions/managementGroup/version.json (100%) rename modules/{Microsoft.Authorization/policyExemptions/resourceGroup/readme.md => Authorization/policyExemptions/resourceGroup/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/policyExemptions/resourceGroup/main.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyExemptions/resourceGroup/version.json (100%) rename modules/{Microsoft.Authorization/policyExemptions/subscription/readme.md => Authorization/policyExemptions/subscription/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/policyExemptions/subscription/main.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policyExemptions/subscription/version.json (100%) rename modules/{Microsoft.Authorization => Authorization}/policyExemptions/version.json (100%) rename modules/{Microsoft.Authorization => Authorization}/policySetDefinitions/.test/mg.common/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policySetDefinitions/.test/mg.min/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policySetDefinitions/.test/sub.common/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policySetDefinitions/.test/sub.min/main.test.bicep (100%) rename modules/{Microsoft.Authorization/policySetDefinitions/readme.md => Authorization/policySetDefinitions/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/policySetDefinitions/main.bicep (100%) rename modules/{Microsoft.Authorization/policySetDefinitions/managementGroup/readme.md => Authorization/policySetDefinitions/managementGroup/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/policySetDefinitions/managementGroup/main.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policySetDefinitions/managementGroup/version.json (100%) rename modules/{Microsoft.Authorization/policySetDefinitions/subscription/readme.md => Authorization/policySetDefinitions/subscription/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/policySetDefinitions/subscription/main.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/policySetDefinitions/subscription/version.json (100%) rename modules/{Microsoft.Authorization => Authorization}/policySetDefinitions/version.json (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/.test/mg.common/dependencies.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/.test/mg.common/interim.dependencies.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/.test/mg.common/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/.test/mg.min/dependencies.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/.test/mg.min/interim.dependencies.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/.test/mg.min/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/.test/rg.common/dependencies.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/.test/rg.common/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/.test/rg.min/dependencies.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/.test/rg.min/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/.test/sub.common/dependencies.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/.test/sub.common/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/.test/sub.min/dependencies.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/.test/sub.min/main.test.bicep (100%) rename modules/{Microsoft.Authorization/roleAssignments/readme.md => Authorization/roleAssignments/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/main.bicep (100%) rename modules/{Microsoft.Authorization/roleAssignments/managementGroup/readme.md => Authorization/roleAssignments/managementGroup/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/managementGroup/main.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/managementGroup/version.json (100%) rename modules/{Microsoft.Authorization/roleAssignments/resourceGroup/readme.md => Authorization/roleAssignments/resourceGroup/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/resourceGroup/main.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/resourceGroup/version.json (100%) rename modules/{Microsoft.Authorization/roleAssignments/subscription/readme.md => Authorization/roleAssignments/subscription/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/subscription/main.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/subscription/version.json (100%) rename modules/{Microsoft.Authorization => Authorization}/roleAssignments/version.json (100%) rename modules/{Microsoft.Authorization => Authorization}/roleDefinitions/.test/mg.common/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleDefinitions/.test/mg.min/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleDefinitions/.test/rg.common/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleDefinitions/.test/rg.min/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleDefinitions/.test/sub.common/main.test.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleDefinitions/.test/sub.min/main.test.bicep (100%) rename modules/{Microsoft.Authorization/roleDefinitions/readme.md => Authorization/roleDefinitions/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/roleDefinitions/main.bicep (100%) rename modules/{Microsoft.Authorization/roleDefinitions/managementGroup/readme.md => Authorization/roleDefinitions/managementGroup/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/roleDefinitions/managementGroup/main.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleDefinitions/managementGroup/version.json (100%) rename modules/{Microsoft.Authorization/roleDefinitions/resourceGroup/readme.md => Authorization/roleDefinitions/resourceGroup/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/roleDefinitions/resourceGroup/main.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleDefinitions/resourceGroup/version.json (100%) rename modules/{Microsoft.Authorization/roleDefinitions/subscription/readme.md => Authorization/roleDefinitions/subscription/README.md} (100%) rename modules/{Microsoft.Authorization => Authorization}/roleDefinitions/subscription/main.bicep (100%) rename modules/{Microsoft.Authorization => Authorization}/roleDefinitions/subscription/version.json (100%) rename modules/{Microsoft.Authorization => Authorization}/roleDefinitions/version.json (100%) diff --git a/modules/Microsoft.Authorization/locks/.test/common/main.test.bicep b/modules/Authorization/locks/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/locks/.test/common/main.test.bicep rename to modules/Authorization/locks/.test/common/main.test.bicep diff --git a/modules/Microsoft.Authorization/locks/readme.md b/modules/Authorization/locks/README.md similarity index 100% rename from modules/Microsoft.Authorization/locks/readme.md rename to modules/Authorization/locks/README.md diff --git a/modules/Microsoft.Authorization/locks/main.bicep b/modules/Authorization/locks/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/locks/main.bicep rename to modules/Authorization/locks/main.bicep diff --git a/modules/Microsoft.Authorization/locks/resourceGroup/readme.md b/modules/Authorization/locks/resourceGroup/README.md similarity index 100% rename from modules/Microsoft.Authorization/locks/resourceGroup/readme.md rename to modules/Authorization/locks/resourceGroup/README.md diff --git a/modules/Microsoft.Authorization/locks/resourceGroup/main.bicep b/modules/Authorization/locks/resourceGroup/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/locks/resourceGroup/main.bicep rename to modules/Authorization/locks/resourceGroup/main.bicep diff --git a/modules/Microsoft.Authorization/locks/resourceGroup/version.json b/modules/Authorization/locks/resourceGroup/version.json similarity index 100% rename from modules/Microsoft.Authorization/locks/resourceGroup/version.json rename to modules/Authorization/locks/resourceGroup/version.json diff --git a/modules/Microsoft.Authorization/locks/subscription/readme.md b/modules/Authorization/locks/subscription/README.md similarity index 100% rename from modules/Microsoft.Authorization/locks/subscription/readme.md rename to modules/Authorization/locks/subscription/README.md diff --git a/modules/Microsoft.Authorization/locks/subscription/main.bicep b/modules/Authorization/locks/subscription/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/locks/subscription/main.bicep rename to modules/Authorization/locks/subscription/main.bicep diff --git a/modules/Microsoft.Authorization/locks/subscription/version.json b/modules/Authorization/locks/subscription/version.json similarity index 100% rename from modules/Microsoft.Authorization/locks/subscription/version.json rename to modules/Authorization/locks/subscription/version.json diff --git a/modules/Microsoft.Authorization/locks/version.json b/modules/Authorization/locks/version.json similarity index 100% rename from modules/Microsoft.Authorization/locks/version.json rename to modules/Authorization/locks/version.json diff --git a/modules/Microsoft.Authorization/policyAssignments/.test/mg.common/main.test.bicep b/modules/Authorization/policyAssignments/.test/mg.common/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyAssignments/.test/mg.common/main.test.bicep rename to modules/Authorization/policyAssignments/.test/mg.common/main.test.bicep diff --git a/modules/Microsoft.Authorization/policyAssignments/.test/mg.min/main.test.bicep b/modules/Authorization/policyAssignments/.test/mg.min/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyAssignments/.test/mg.min/main.test.bicep rename to modules/Authorization/policyAssignments/.test/mg.min/main.test.bicep diff --git a/modules/Microsoft.Authorization/policyAssignments/.test/rg.common/dependencies.bicep b/modules/Authorization/policyAssignments/.test/rg.common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyAssignments/.test/rg.common/dependencies.bicep rename to modules/Authorization/policyAssignments/.test/rg.common/dependencies.bicep diff --git a/modules/Microsoft.Authorization/policyAssignments/.test/rg.common/main.test.bicep b/modules/Authorization/policyAssignments/.test/rg.common/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyAssignments/.test/rg.common/main.test.bicep rename to modules/Authorization/policyAssignments/.test/rg.common/main.test.bicep diff --git a/modules/Microsoft.Authorization/policyAssignments/.test/rg.min/main.test.bicep b/modules/Authorization/policyAssignments/.test/rg.min/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyAssignments/.test/rg.min/main.test.bicep rename to modules/Authorization/policyAssignments/.test/rg.min/main.test.bicep diff --git a/modules/Microsoft.Authorization/policyAssignments/.test/sub.common/dependencies.bicep b/modules/Authorization/policyAssignments/.test/sub.common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyAssignments/.test/sub.common/dependencies.bicep rename to modules/Authorization/policyAssignments/.test/sub.common/dependencies.bicep diff --git a/modules/Microsoft.Authorization/policyAssignments/.test/sub.common/main.test.bicep b/modules/Authorization/policyAssignments/.test/sub.common/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyAssignments/.test/sub.common/main.test.bicep rename to modules/Authorization/policyAssignments/.test/sub.common/main.test.bicep diff --git a/modules/Microsoft.Authorization/policyAssignments/.test/sub.min/main.test.bicep b/modules/Authorization/policyAssignments/.test/sub.min/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyAssignments/.test/sub.min/main.test.bicep rename to modules/Authorization/policyAssignments/.test/sub.min/main.test.bicep diff --git a/modules/Microsoft.Authorization/policyAssignments/readme.md b/modules/Authorization/policyAssignments/README.md similarity index 100% rename from modules/Microsoft.Authorization/policyAssignments/readme.md rename to modules/Authorization/policyAssignments/README.md diff --git a/modules/Microsoft.Authorization/policyAssignments/main.bicep b/modules/Authorization/policyAssignments/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyAssignments/main.bicep rename to modules/Authorization/policyAssignments/main.bicep diff --git a/modules/Microsoft.Authorization/policyAssignments/managementGroup/readme.md b/modules/Authorization/policyAssignments/managementGroup/README.md similarity index 100% rename from modules/Microsoft.Authorization/policyAssignments/managementGroup/readme.md rename to modules/Authorization/policyAssignments/managementGroup/README.md diff --git a/modules/Microsoft.Authorization/policyAssignments/managementGroup/main.bicep b/modules/Authorization/policyAssignments/managementGroup/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyAssignments/managementGroup/main.bicep rename to modules/Authorization/policyAssignments/managementGroup/main.bicep diff --git a/modules/Microsoft.Authorization/policyAssignments/managementGroup/version.json b/modules/Authorization/policyAssignments/managementGroup/version.json similarity index 100% rename from modules/Microsoft.Authorization/policyAssignments/managementGroup/version.json rename to modules/Authorization/policyAssignments/managementGroup/version.json diff --git a/modules/Microsoft.Authorization/policyAssignments/resourceGroup/readme.md b/modules/Authorization/policyAssignments/resourceGroup/README.md similarity index 100% rename from modules/Microsoft.Authorization/policyAssignments/resourceGroup/readme.md rename to modules/Authorization/policyAssignments/resourceGroup/README.md diff --git a/modules/Microsoft.Authorization/policyAssignments/resourceGroup/main.bicep b/modules/Authorization/policyAssignments/resourceGroup/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyAssignments/resourceGroup/main.bicep rename to modules/Authorization/policyAssignments/resourceGroup/main.bicep diff --git a/modules/Microsoft.Authorization/policyAssignments/resourceGroup/version.json b/modules/Authorization/policyAssignments/resourceGroup/version.json similarity index 100% rename from modules/Microsoft.Authorization/policyAssignments/resourceGroup/version.json rename to modules/Authorization/policyAssignments/resourceGroup/version.json diff --git a/modules/Microsoft.Authorization/policyAssignments/subscription/readme.md b/modules/Authorization/policyAssignments/subscription/README.md similarity index 100% rename from modules/Microsoft.Authorization/policyAssignments/subscription/readme.md rename to modules/Authorization/policyAssignments/subscription/README.md diff --git a/modules/Microsoft.Authorization/policyAssignments/subscription/main.bicep b/modules/Authorization/policyAssignments/subscription/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyAssignments/subscription/main.bicep rename to modules/Authorization/policyAssignments/subscription/main.bicep diff --git a/modules/Microsoft.Authorization/policyAssignments/subscription/version.json b/modules/Authorization/policyAssignments/subscription/version.json similarity index 100% rename from modules/Microsoft.Authorization/policyAssignments/subscription/version.json rename to modules/Authorization/policyAssignments/subscription/version.json diff --git a/modules/Microsoft.Authorization/policyAssignments/version.json b/modules/Authorization/policyAssignments/version.json similarity index 100% rename from modules/Microsoft.Authorization/policyAssignments/version.json rename to modules/Authorization/policyAssignments/version.json diff --git a/modules/Microsoft.Authorization/policyDefinitions/.test/mg.common/main.test.bicep b/modules/Authorization/policyDefinitions/.test/mg.common/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyDefinitions/.test/mg.common/main.test.bicep rename to modules/Authorization/policyDefinitions/.test/mg.common/main.test.bicep diff --git a/modules/Microsoft.Authorization/policyDefinitions/.test/mg.min/main.test.bicep b/modules/Authorization/policyDefinitions/.test/mg.min/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyDefinitions/.test/mg.min/main.test.bicep rename to modules/Authorization/policyDefinitions/.test/mg.min/main.test.bicep diff --git a/modules/Microsoft.Authorization/policyDefinitions/.test/sub.common/main.test.bicep b/modules/Authorization/policyDefinitions/.test/sub.common/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyDefinitions/.test/sub.common/main.test.bicep rename to modules/Authorization/policyDefinitions/.test/sub.common/main.test.bicep diff --git a/modules/Microsoft.Authorization/policyDefinitions/.test/sub.min/main.test.bicep b/modules/Authorization/policyDefinitions/.test/sub.min/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyDefinitions/.test/sub.min/main.test.bicep rename to modules/Authorization/policyDefinitions/.test/sub.min/main.test.bicep diff --git a/modules/Microsoft.Authorization/policyDefinitions/readme.md b/modules/Authorization/policyDefinitions/README.md similarity index 100% rename from modules/Microsoft.Authorization/policyDefinitions/readme.md rename to modules/Authorization/policyDefinitions/README.md diff --git a/modules/Microsoft.Authorization/policyDefinitions/main.bicep b/modules/Authorization/policyDefinitions/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyDefinitions/main.bicep rename to modules/Authorization/policyDefinitions/main.bicep diff --git a/modules/Microsoft.Authorization/policyDefinitions/managementGroup/readme.md b/modules/Authorization/policyDefinitions/managementGroup/README.md similarity index 100% rename from modules/Microsoft.Authorization/policyDefinitions/managementGroup/readme.md rename to modules/Authorization/policyDefinitions/managementGroup/README.md diff --git a/modules/Microsoft.Authorization/policyDefinitions/managementGroup/main.bicep b/modules/Authorization/policyDefinitions/managementGroup/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyDefinitions/managementGroup/main.bicep rename to modules/Authorization/policyDefinitions/managementGroup/main.bicep diff --git a/modules/Microsoft.Authorization/policyDefinitions/managementGroup/version.json b/modules/Authorization/policyDefinitions/managementGroup/version.json similarity index 100% rename from modules/Microsoft.Authorization/policyDefinitions/managementGroup/version.json rename to modules/Authorization/policyDefinitions/managementGroup/version.json diff --git a/modules/Microsoft.Authorization/policyDefinitions/subscription/readme.md b/modules/Authorization/policyDefinitions/subscription/README.md similarity index 100% rename from modules/Microsoft.Authorization/policyDefinitions/subscription/readme.md rename to modules/Authorization/policyDefinitions/subscription/README.md diff --git a/modules/Microsoft.Authorization/policyDefinitions/subscription/main.bicep b/modules/Authorization/policyDefinitions/subscription/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyDefinitions/subscription/main.bicep rename to modules/Authorization/policyDefinitions/subscription/main.bicep diff --git a/modules/Microsoft.Authorization/policyDefinitions/subscription/version.json b/modules/Authorization/policyDefinitions/subscription/version.json similarity index 100% rename from modules/Microsoft.Authorization/policyDefinitions/subscription/version.json rename to modules/Authorization/policyDefinitions/subscription/version.json diff --git a/modules/Microsoft.Authorization/policyDefinitions/version.json b/modules/Authorization/policyDefinitions/version.json similarity index 100% rename from modules/Microsoft.Authorization/policyDefinitions/version.json rename to modules/Authorization/policyDefinitions/version.json diff --git a/modules/Microsoft.Authorization/policyExemptions/.test/mg.common/main.test.bicep b/modules/Authorization/policyExemptions/.test/mg.common/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyExemptions/.test/mg.common/main.test.bicep rename to modules/Authorization/policyExemptions/.test/mg.common/main.test.bicep diff --git a/modules/Microsoft.Authorization/policyExemptions/.test/mg.min/main.test.bicep b/modules/Authorization/policyExemptions/.test/mg.min/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyExemptions/.test/mg.min/main.test.bicep rename to modules/Authorization/policyExemptions/.test/mg.min/main.test.bicep diff --git a/modules/Microsoft.Authorization/policyExemptions/.test/rg.common/main.test.bicep b/modules/Authorization/policyExemptions/.test/rg.common/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyExemptions/.test/rg.common/main.test.bicep rename to modules/Authorization/policyExemptions/.test/rg.common/main.test.bicep diff --git a/modules/Microsoft.Authorization/policyExemptions/.test/rg.min/main.test.bicep b/modules/Authorization/policyExemptions/.test/rg.min/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyExemptions/.test/rg.min/main.test.bicep rename to modules/Authorization/policyExemptions/.test/rg.min/main.test.bicep diff --git a/modules/Microsoft.Authorization/policyExemptions/.test/sub.common/main.test.bicep b/modules/Authorization/policyExemptions/.test/sub.common/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyExemptions/.test/sub.common/main.test.bicep rename to modules/Authorization/policyExemptions/.test/sub.common/main.test.bicep diff --git a/modules/Microsoft.Authorization/policyExemptions/.test/sub.min/main.test.bicep b/modules/Authorization/policyExemptions/.test/sub.min/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyExemptions/.test/sub.min/main.test.bicep rename to modules/Authorization/policyExemptions/.test/sub.min/main.test.bicep diff --git a/modules/Microsoft.Authorization/policyExemptions/readme.md b/modules/Authorization/policyExemptions/README.md similarity index 100% rename from modules/Microsoft.Authorization/policyExemptions/readme.md rename to modules/Authorization/policyExemptions/README.md diff --git a/modules/Microsoft.Authorization/policyExemptions/main.bicep b/modules/Authorization/policyExemptions/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyExemptions/main.bicep rename to modules/Authorization/policyExemptions/main.bicep diff --git a/modules/Microsoft.Authorization/policyExemptions/managementGroup/readme.md b/modules/Authorization/policyExemptions/managementGroup/README.md similarity index 100% rename from modules/Microsoft.Authorization/policyExemptions/managementGroup/readme.md rename to modules/Authorization/policyExemptions/managementGroup/README.md diff --git a/modules/Microsoft.Authorization/policyExemptions/managementGroup/main.bicep b/modules/Authorization/policyExemptions/managementGroup/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyExemptions/managementGroup/main.bicep rename to modules/Authorization/policyExemptions/managementGroup/main.bicep diff --git a/modules/Microsoft.Authorization/policyExemptions/managementGroup/version.json b/modules/Authorization/policyExemptions/managementGroup/version.json similarity index 100% rename from modules/Microsoft.Authorization/policyExemptions/managementGroup/version.json rename to modules/Authorization/policyExemptions/managementGroup/version.json diff --git a/modules/Microsoft.Authorization/policyExemptions/resourceGroup/readme.md b/modules/Authorization/policyExemptions/resourceGroup/README.md similarity index 100% rename from modules/Microsoft.Authorization/policyExemptions/resourceGroup/readme.md rename to modules/Authorization/policyExemptions/resourceGroup/README.md diff --git a/modules/Microsoft.Authorization/policyExemptions/resourceGroup/main.bicep b/modules/Authorization/policyExemptions/resourceGroup/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyExemptions/resourceGroup/main.bicep rename to modules/Authorization/policyExemptions/resourceGroup/main.bicep diff --git a/modules/Microsoft.Authorization/policyExemptions/resourceGroup/version.json b/modules/Authorization/policyExemptions/resourceGroup/version.json similarity index 100% rename from modules/Microsoft.Authorization/policyExemptions/resourceGroup/version.json rename to modules/Authorization/policyExemptions/resourceGroup/version.json diff --git a/modules/Microsoft.Authorization/policyExemptions/subscription/readme.md b/modules/Authorization/policyExemptions/subscription/README.md similarity index 100% rename from modules/Microsoft.Authorization/policyExemptions/subscription/readme.md rename to modules/Authorization/policyExemptions/subscription/README.md diff --git a/modules/Microsoft.Authorization/policyExemptions/subscription/main.bicep b/modules/Authorization/policyExemptions/subscription/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/policyExemptions/subscription/main.bicep rename to modules/Authorization/policyExemptions/subscription/main.bicep diff --git a/modules/Microsoft.Authorization/policyExemptions/subscription/version.json b/modules/Authorization/policyExemptions/subscription/version.json similarity index 100% rename from modules/Microsoft.Authorization/policyExemptions/subscription/version.json rename to modules/Authorization/policyExemptions/subscription/version.json diff --git a/modules/Microsoft.Authorization/policyExemptions/version.json b/modules/Authorization/policyExemptions/version.json similarity index 100% rename from modules/Microsoft.Authorization/policyExemptions/version.json rename to modules/Authorization/policyExemptions/version.json diff --git a/modules/Microsoft.Authorization/policySetDefinitions/.test/mg.common/main.test.bicep b/modules/Authorization/policySetDefinitions/.test/mg.common/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/policySetDefinitions/.test/mg.common/main.test.bicep rename to modules/Authorization/policySetDefinitions/.test/mg.common/main.test.bicep diff --git a/modules/Microsoft.Authorization/policySetDefinitions/.test/mg.min/main.test.bicep b/modules/Authorization/policySetDefinitions/.test/mg.min/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/policySetDefinitions/.test/mg.min/main.test.bicep rename to modules/Authorization/policySetDefinitions/.test/mg.min/main.test.bicep diff --git a/modules/Microsoft.Authorization/policySetDefinitions/.test/sub.common/main.test.bicep b/modules/Authorization/policySetDefinitions/.test/sub.common/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/policySetDefinitions/.test/sub.common/main.test.bicep rename to modules/Authorization/policySetDefinitions/.test/sub.common/main.test.bicep diff --git a/modules/Microsoft.Authorization/policySetDefinitions/.test/sub.min/main.test.bicep b/modules/Authorization/policySetDefinitions/.test/sub.min/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/policySetDefinitions/.test/sub.min/main.test.bicep rename to modules/Authorization/policySetDefinitions/.test/sub.min/main.test.bicep diff --git a/modules/Microsoft.Authorization/policySetDefinitions/readme.md b/modules/Authorization/policySetDefinitions/README.md similarity index 100% rename from modules/Microsoft.Authorization/policySetDefinitions/readme.md rename to modules/Authorization/policySetDefinitions/README.md diff --git a/modules/Microsoft.Authorization/policySetDefinitions/main.bicep b/modules/Authorization/policySetDefinitions/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/policySetDefinitions/main.bicep rename to modules/Authorization/policySetDefinitions/main.bicep diff --git a/modules/Microsoft.Authorization/policySetDefinitions/managementGroup/readme.md b/modules/Authorization/policySetDefinitions/managementGroup/README.md similarity index 100% rename from modules/Microsoft.Authorization/policySetDefinitions/managementGroup/readme.md rename to modules/Authorization/policySetDefinitions/managementGroup/README.md diff --git a/modules/Microsoft.Authorization/policySetDefinitions/managementGroup/main.bicep b/modules/Authorization/policySetDefinitions/managementGroup/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/policySetDefinitions/managementGroup/main.bicep rename to modules/Authorization/policySetDefinitions/managementGroup/main.bicep diff --git a/modules/Microsoft.Authorization/policySetDefinitions/managementGroup/version.json b/modules/Authorization/policySetDefinitions/managementGroup/version.json similarity index 100% rename from modules/Microsoft.Authorization/policySetDefinitions/managementGroup/version.json rename to modules/Authorization/policySetDefinitions/managementGroup/version.json diff --git a/modules/Microsoft.Authorization/policySetDefinitions/subscription/readme.md b/modules/Authorization/policySetDefinitions/subscription/README.md similarity index 100% rename from modules/Microsoft.Authorization/policySetDefinitions/subscription/readme.md rename to modules/Authorization/policySetDefinitions/subscription/README.md diff --git a/modules/Microsoft.Authorization/policySetDefinitions/subscription/main.bicep b/modules/Authorization/policySetDefinitions/subscription/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/policySetDefinitions/subscription/main.bicep rename to modules/Authorization/policySetDefinitions/subscription/main.bicep diff --git a/modules/Microsoft.Authorization/policySetDefinitions/subscription/version.json b/modules/Authorization/policySetDefinitions/subscription/version.json similarity index 100% rename from modules/Microsoft.Authorization/policySetDefinitions/subscription/version.json rename to modules/Authorization/policySetDefinitions/subscription/version.json diff --git a/modules/Microsoft.Authorization/policySetDefinitions/version.json b/modules/Authorization/policySetDefinitions/version.json similarity index 100% rename from modules/Microsoft.Authorization/policySetDefinitions/version.json rename to modules/Authorization/policySetDefinitions/version.json diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/mg.common/dependencies.bicep b/modules/Authorization/roleAssignments/.test/mg.common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/.test/mg.common/dependencies.bicep rename to modules/Authorization/roleAssignments/.test/mg.common/dependencies.bicep diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/mg.common/interim.dependencies.bicep b/modules/Authorization/roleAssignments/.test/mg.common/interim.dependencies.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/.test/mg.common/interim.dependencies.bicep rename to modules/Authorization/roleAssignments/.test/mg.common/interim.dependencies.bicep diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/mg.common/main.test.bicep b/modules/Authorization/roleAssignments/.test/mg.common/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/.test/mg.common/main.test.bicep rename to modules/Authorization/roleAssignments/.test/mg.common/main.test.bicep diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/mg.min/dependencies.bicep b/modules/Authorization/roleAssignments/.test/mg.min/dependencies.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/.test/mg.min/dependencies.bicep rename to modules/Authorization/roleAssignments/.test/mg.min/dependencies.bicep diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/mg.min/interim.dependencies.bicep b/modules/Authorization/roleAssignments/.test/mg.min/interim.dependencies.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/.test/mg.min/interim.dependencies.bicep rename to modules/Authorization/roleAssignments/.test/mg.min/interim.dependencies.bicep diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/mg.min/main.test.bicep b/modules/Authorization/roleAssignments/.test/mg.min/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/.test/mg.min/main.test.bicep rename to modules/Authorization/roleAssignments/.test/mg.min/main.test.bicep diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/rg.common/dependencies.bicep b/modules/Authorization/roleAssignments/.test/rg.common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/.test/rg.common/dependencies.bicep rename to modules/Authorization/roleAssignments/.test/rg.common/dependencies.bicep diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/rg.common/main.test.bicep b/modules/Authorization/roleAssignments/.test/rg.common/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/.test/rg.common/main.test.bicep rename to modules/Authorization/roleAssignments/.test/rg.common/main.test.bicep diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/rg.min/dependencies.bicep b/modules/Authorization/roleAssignments/.test/rg.min/dependencies.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/.test/rg.min/dependencies.bicep rename to modules/Authorization/roleAssignments/.test/rg.min/dependencies.bicep diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/rg.min/main.test.bicep b/modules/Authorization/roleAssignments/.test/rg.min/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/.test/rg.min/main.test.bicep rename to modules/Authorization/roleAssignments/.test/rg.min/main.test.bicep diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/sub.common/dependencies.bicep b/modules/Authorization/roleAssignments/.test/sub.common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/.test/sub.common/dependencies.bicep rename to modules/Authorization/roleAssignments/.test/sub.common/dependencies.bicep diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/sub.common/main.test.bicep b/modules/Authorization/roleAssignments/.test/sub.common/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/.test/sub.common/main.test.bicep rename to modules/Authorization/roleAssignments/.test/sub.common/main.test.bicep diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/sub.min/dependencies.bicep b/modules/Authorization/roleAssignments/.test/sub.min/dependencies.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/.test/sub.min/dependencies.bicep rename to modules/Authorization/roleAssignments/.test/sub.min/dependencies.bicep diff --git a/modules/Microsoft.Authorization/roleAssignments/.test/sub.min/main.test.bicep b/modules/Authorization/roleAssignments/.test/sub.min/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/.test/sub.min/main.test.bicep rename to modules/Authorization/roleAssignments/.test/sub.min/main.test.bicep diff --git a/modules/Microsoft.Authorization/roleAssignments/readme.md b/modules/Authorization/roleAssignments/README.md similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/readme.md rename to modules/Authorization/roleAssignments/README.md diff --git a/modules/Microsoft.Authorization/roleAssignments/main.bicep b/modules/Authorization/roleAssignments/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/main.bicep rename to modules/Authorization/roleAssignments/main.bicep diff --git a/modules/Microsoft.Authorization/roleAssignments/managementGroup/readme.md b/modules/Authorization/roleAssignments/managementGroup/README.md similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/managementGroup/readme.md rename to modules/Authorization/roleAssignments/managementGroup/README.md diff --git a/modules/Microsoft.Authorization/roleAssignments/managementGroup/main.bicep b/modules/Authorization/roleAssignments/managementGroup/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/managementGroup/main.bicep rename to modules/Authorization/roleAssignments/managementGroup/main.bicep diff --git a/modules/Microsoft.Authorization/roleAssignments/managementGroup/version.json b/modules/Authorization/roleAssignments/managementGroup/version.json similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/managementGroup/version.json rename to modules/Authorization/roleAssignments/managementGroup/version.json diff --git a/modules/Microsoft.Authorization/roleAssignments/resourceGroup/readme.md b/modules/Authorization/roleAssignments/resourceGroup/README.md similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/resourceGroup/readme.md rename to modules/Authorization/roleAssignments/resourceGroup/README.md diff --git a/modules/Microsoft.Authorization/roleAssignments/resourceGroup/main.bicep b/modules/Authorization/roleAssignments/resourceGroup/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/resourceGroup/main.bicep rename to modules/Authorization/roleAssignments/resourceGroup/main.bicep diff --git a/modules/Microsoft.Authorization/roleAssignments/resourceGroup/version.json b/modules/Authorization/roleAssignments/resourceGroup/version.json similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/resourceGroup/version.json rename to modules/Authorization/roleAssignments/resourceGroup/version.json diff --git a/modules/Microsoft.Authorization/roleAssignments/subscription/readme.md b/modules/Authorization/roleAssignments/subscription/README.md similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/subscription/readme.md rename to modules/Authorization/roleAssignments/subscription/README.md diff --git a/modules/Microsoft.Authorization/roleAssignments/subscription/main.bicep b/modules/Authorization/roleAssignments/subscription/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/subscription/main.bicep rename to modules/Authorization/roleAssignments/subscription/main.bicep diff --git a/modules/Microsoft.Authorization/roleAssignments/subscription/version.json b/modules/Authorization/roleAssignments/subscription/version.json similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/subscription/version.json rename to modules/Authorization/roleAssignments/subscription/version.json diff --git a/modules/Microsoft.Authorization/roleAssignments/version.json b/modules/Authorization/roleAssignments/version.json similarity index 100% rename from modules/Microsoft.Authorization/roleAssignments/version.json rename to modules/Authorization/roleAssignments/version.json diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/mg.common/main.test.bicep b/modules/Authorization/roleDefinitions/.test/mg.common/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleDefinitions/.test/mg.common/main.test.bicep rename to modules/Authorization/roleDefinitions/.test/mg.common/main.test.bicep diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/mg.min/main.test.bicep b/modules/Authorization/roleDefinitions/.test/mg.min/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleDefinitions/.test/mg.min/main.test.bicep rename to modules/Authorization/roleDefinitions/.test/mg.min/main.test.bicep diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/rg.common/main.test.bicep b/modules/Authorization/roleDefinitions/.test/rg.common/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleDefinitions/.test/rg.common/main.test.bicep rename to modules/Authorization/roleDefinitions/.test/rg.common/main.test.bicep diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/rg.min/main.test.bicep b/modules/Authorization/roleDefinitions/.test/rg.min/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleDefinitions/.test/rg.min/main.test.bicep rename to modules/Authorization/roleDefinitions/.test/rg.min/main.test.bicep diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/sub.common/main.test.bicep b/modules/Authorization/roleDefinitions/.test/sub.common/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleDefinitions/.test/sub.common/main.test.bicep rename to modules/Authorization/roleDefinitions/.test/sub.common/main.test.bicep diff --git a/modules/Microsoft.Authorization/roleDefinitions/.test/sub.min/main.test.bicep b/modules/Authorization/roleDefinitions/.test/sub.min/main.test.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleDefinitions/.test/sub.min/main.test.bicep rename to modules/Authorization/roleDefinitions/.test/sub.min/main.test.bicep diff --git a/modules/Microsoft.Authorization/roleDefinitions/readme.md b/modules/Authorization/roleDefinitions/README.md similarity index 100% rename from modules/Microsoft.Authorization/roleDefinitions/readme.md rename to modules/Authorization/roleDefinitions/README.md diff --git a/modules/Microsoft.Authorization/roleDefinitions/main.bicep b/modules/Authorization/roleDefinitions/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleDefinitions/main.bicep rename to modules/Authorization/roleDefinitions/main.bicep diff --git a/modules/Microsoft.Authorization/roleDefinitions/managementGroup/readme.md b/modules/Authorization/roleDefinitions/managementGroup/README.md similarity index 100% rename from modules/Microsoft.Authorization/roleDefinitions/managementGroup/readme.md rename to modules/Authorization/roleDefinitions/managementGroup/README.md diff --git a/modules/Microsoft.Authorization/roleDefinitions/managementGroup/main.bicep b/modules/Authorization/roleDefinitions/managementGroup/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleDefinitions/managementGroup/main.bicep rename to modules/Authorization/roleDefinitions/managementGroup/main.bicep diff --git a/modules/Microsoft.Authorization/roleDefinitions/managementGroup/version.json b/modules/Authorization/roleDefinitions/managementGroup/version.json similarity index 100% rename from modules/Microsoft.Authorization/roleDefinitions/managementGroup/version.json rename to modules/Authorization/roleDefinitions/managementGroup/version.json diff --git a/modules/Microsoft.Authorization/roleDefinitions/resourceGroup/readme.md b/modules/Authorization/roleDefinitions/resourceGroup/README.md similarity index 100% rename from modules/Microsoft.Authorization/roleDefinitions/resourceGroup/readme.md rename to modules/Authorization/roleDefinitions/resourceGroup/README.md diff --git a/modules/Microsoft.Authorization/roleDefinitions/resourceGroup/main.bicep b/modules/Authorization/roleDefinitions/resourceGroup/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleDefinitions/resourceGroup/main.bicep rename to modules/Authorization/roleDefinitions/resourceGroup/main.bicep diff --git a/modules/Microsoft.Authorization/roleDefinitions/resourceGroup/version.json b/modules/Authorization/roleDefinitions/resourceGroup/version.json similarity index 100% rename from modules/Microsoft.Authorization/roleDefinitions/resourceGroup/version.json rename to modules/Authorization/roleDefinitions/resourceGroup/version.json diff --git a/modules/Microsoft.Authorization/roleDefinitions/subscription/readme.md b/modules/Authorization/roleDefinitions/subscription/README.md similarity index 100% rename from modules/Microsoft.Authorization/roleDefinitions/subscription/readme.md rename to modules/Authorization/roleDefinitions/subscription/README.md diff --git a/modules/Microsoft.Authorization/roleDefinitions/subscription/main.bicep b/modules/Authorization/roleDefinitions/subscription/main.bicep similarity index 100% rename from modules/Microsoft.Authorization/roleDefinitions/subscription/main.bicep rename to modules/Authorization/roleDefinitions/subscription/main.bicep diff --git a/modules/Microsoft.Authorization/roleDefinitions/subscription/version.json b/modules/Authorization/roleDefinitions/subscription/version.json similarity index 100% rename from modules/Microsoft.Authorization/roleDefinitions/subscription/version.json rename to modules/Authorization/roleDefinitions/subscription/version.json diff --git a/modules/Microsoft.Authorization/roleDefinitions/version.json b/modules/Authorization/roleDefinitions/version.json similarity index 100% rename from modules/Microsoft.Authorization/roleDefinitions/version.json rename to modules/Authorization/roleDefinitions/version.json From f223b41ea24dfa35b66619e1d9b057ea018a5431 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 20:23:40 +0200 Subject: [PATCH 39/63] authorization workflow --- .github/workflows/ms.authorization.policyassignments.yml | 4 ++-- .github/workflows/ms.authorization.policydefinitions.yml | 4 ++-- .github/workflows/ms.authorization.policyexemptions.yml | 4 ++-- .github/workflows/ms.authorization.policysetdefinitions.yml | 4 ++-- .github/workflows/ms.authorization.roleassignments.yml | 4 ++-- .github/workflows/ms.authorization.roledefinitions.yml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ms.authorization.policyassignments.yml b/.github/workflows/ms.authorization.policyassignments.yml index 3124a44cc4..43b3865aba 100644 --- a/.github/workflows/ms.authorization.policyassignments.yml +++ b/.github/workflows/ms.authorization.policyassignments.yml @@ -30,13 +30,13 @@ on: - '.github/actions/templates/**' - '.github/workflows/template.module.yml' - '.github/workflows/ms.authorization.policyassignments.yml' - - 'modules/Microsoft.Authorization/policyAssignments/**' + - 'modules/Authorization/policyAssignments/**' - 'utilities/pipelines/**' - '!utilities/pipelines/deploymentRemoval/**' - '!*/**/readme.md' env: - modulePath: 'modules/Microsoft.Authorization/policyAssignments' + modulePath: 'modules/Authorization/policyAssignments' workflowPath: '.github/workflows/ms.authorization.policyassignments.yml' concurrency: diff --git a/.github/workflows/ms.authorization.policydefinitions.yml b/.github/workflows/ms.authorization.policydefinitions.yml index b52702ef08..0b2ceafcd3 100644 --- a/.github/workflows/ms.authorization.policydefinitions.yml +++ b/.github/workflows/ms.authorization.policydefinitions.yml @@ -30,13 +30,13 @@ on: - '.github/actions/templates/**' - '.github/workflows/template.module.yml' - '.github/workflows/ms.authorization.policydefinitions.yml' - - 'modules/Microsoft.Authorization/policyDefinitions/**' + - 'modules/Authorization/policyDefinitions/**' - 'utilities/pipelines/**' - '!utilities/pipelines/deploymentRemoval/**' - '!*/**/readme.md' env: - modulePath: 'modules/Microsoft.Authorization/policyDefinitions' + modulePath: 'modules/Authorization/policyDefinitions' workflowPath: '.github/workflows/ms.authorization.policydefinitions.yml' concurrency: diff --git a/.github/workflows/ms.authorization.policyexemptions.yml b/.github/workflows/ms.authorization.policyexemptions.yml index c8044223b8..6b021932c4 100644 --- a/.github/workflows/ms.authorization.policyexemptions.yml +++ b/.github/workflows/ms.authorization.policyexemptions.yml @@ -30,13 +30,13 @@ on: - '.github/actions/templates/**' - '.github/workflows/template.module.yml' - '.github/workflows/ms.authorization.policyexemptions.yml' - - 'modules/Microsoft.Authorization/policyExemptions/**' + - 'modules/Authorization/policyExemptions/**' - 'utilities/pipelines/**' - '!utilities/pipelines/deploymentRemoval/**' - '!*/**/readme.md' env: - modulePath: 'modules/Microsoft.Authorization/policyExemptions' + modulePath: 'modules/Authorization/policyExemptions' workflowPath: '.github/workflows/ms.authorization.policyexemptions.yml' concurrency: diff --git a/.github/workflows/ms.authorization.policysetdefinitions.yml b/.github/workflows/ms.authorization.policysetdefinitions.yml index d5715ec145..bf88d56952 100644 --- a/.github/workflows/ms.authorization.policysetdefinitions.yml +++ b/.github/workflows/ms.authorization.policysetdefinitions.yml @@ -30,13 +30,13 @@ on: - '.github/actions/templates/**' - '.github/workflows/template.module.yml' - '.github/workflows/ms.authorization.policysetdefinitions.yml' - - 'modules/Microsoft.Authorization/policySetDefinitions/**' + - 'modules/Authorization/policySetDefinitions/**' - 'utilities/pipelines/**' - '!utilities/pipelines/deploymentRemoval/**' - '!*/**/readme.md' env: - modulePath: 'modules/Microsoft.Authorization/policySetDefinitions' + modulePath: 'modules/Authorization/policySetDefinitions' workflowPath: '.github/workflows/ms.authorization.policysetdefinitions.yml' concurrency: diff --git a/.github/workflows/ms.authorization.roleassignments.yml b/.github/workflows/ms.authorization.roleassignments.yml index e7f884bab5..848c5725f3 100644 --- a/.github/workflows/ms.authorization.roleassignments.yml +++ b/.github/workflows/ms.authorization.roleassignments.yml @@ -30,13 +30,13 @@ on: - '.github/actions/templates/**' - '.github/workflows/template.module.yml' - '.github/workflows/ms.authorization.roleassignments.yml' - - 'modules/Microsoft.Authorization/roleAssignments/**' + - 'modules/Authorization/roleAssignments/**' - 'utilities/pipelines/**' - '!utilities/pipelines/deploymentRemoval/**' - '!*/**/readme.md' env: - modulePath: 'modules/Microsoft.Authorization/roleAssignments' + modulePath: 'modules/Authorization/roleAssignments' workflowPath: '.github/workflows/ms.authorization.roleassignments.yml' concurrency: diff --git a/.github/workflows/ms.authorization.roledefinitions.yml b/.github/workflows/ms.authorization.roledefinitions.yml index caf65f4bcb..213186747d 100644 --- a/.github/workflows/ms.authorization.roledefinitions.yml +++ b/.github/workflows/ms.authorization.roledefinitions.yml @@ -30,13 +30,13 @@ on: - '.github/actions/templates/**' - '.github/workflows/template.module.yml' - '.github/workflows/ms.authorization.roledefinitions.yml' - - 'modules/Microsoft.Authorization/roleDefinitions/**' + - 'modules/Authorization/roleDefinitions/**' - 'utilities/pipelines/**' - '!utilities/pipelines/deploymentRemoval/**' - '!*/**/readme.md' env: - modulePath: 'modules/Microsoft.Authorization/roleDefinitions' + modulePath: 'modules/Authorization/roleDefinitions' workflowPath: '.github/workflows/ms.authorization.roledefinitions.yml' concurrency: From f0b2a71fd9b300b4c4f69e0f94351e3b3090be57 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 20:24:53 +0200 Subject: [PATCH 40/63] authorization pipelines --- .azuredevops/modulePipelines/ms.authorization.locks.yml | 4 ++-- .../modulePipelines/ms.authorization.policyassignments.yml | 4 ++-- .../modulePipelines/ms.authorization.policydefinitions.yml | 4 ++-- .../modulePipelines/ms.authorization.policyexemptions.yml | 4 ++-- .../modulePipelines/ms.authorization.policysetdefinitions.yml | 4 ++-- .../modulePipelines/ms.authorization.roleassignments.yml | 4 ++-- .../modulePipelines/ms.authorization.roledefinitions.yml | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.azuredevops/modulePipelines/ms.authorization.locks.yml b/.azuredevops/modulePipelines/ms.authorization.locks.yml index f14f72fbd5..e5be4f3747 100644 --- a/.azuredevops/modulePipelines/ms.authorization.locks.yml +++ b/.azuredevops/modulePipelines/ms.authorization.locks.yml @@ -29,7 +29,7 @@ trigger: include: - '/.azuredevops/modulePipelines/ms.authorization.locks.yml' - '/.azuredevops/pipelineTemplates/*.yml' - - '/modules/Microsoft.Authorization/locks/*' + - '/modules/Authorization/locks/*' - '/utilities/pipelines/*' exclude: - '/utilities/pipelines/deploymentRemoval/*' @@ -39,7 +39,7 @@ variables: - template: '../../settings.yml' - group: 'PLATFORM_VARIABLES' - name: modulePath - value: '/modules/Microsoft.Authorization/locks' + value: '/modules/Authorization/locks' stages: - template: /.azuredevops/pipelineTemplates/stages.module.yml diff --git a/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml b/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml index c7c51f5618..416b34e929 100644 --- a/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml +++ b/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml @@ -29,7 +29,7 @@ trigger: include: - '/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml' - '/.azuredevops/pipelineTemplates/*.yml' - - '/modules/Microsoft.Authorization/policyAssignments/*' + - '/modules/Authorization/policyAssignments/*' - '/utilities/pipelines/*' exclude: - '/utilities/pipelines/deploymentRemoval/*' @@ -39,7 +39,7 @@ variables: - template: '../../settings.yml' - group: 'PLATFORM_VARIABLES' - name: modulePath - value: '/modules/Microsoft.Authorization/policyAssignments' + value: '/modules/Authorization/policyAssignments' stages: - template: /.azuredevops/pipelineTemplates/stages.module.yml diff --git a/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml index 82d673f1e0..dbc88b841e 100644 --- a/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml +++ b/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml @@ -29,7 +29,7 @@ trigger: include: - '/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml' - '/.azuredevops/pipelineTemplates/*.yml' - - '/modules/Microsoft.Authorization/policyDefinitions/*' + - '/modules/Authorization/policyDefinitions/*' - '/utilities/pipelines/*' exclude: - '/utilities/pipelines/deploymentRemoval/*' @@ -39,7 +39,7 @@ variables: - template: '../../settings.yml' - group: 'PLATFORM_VARIABLES' - name: modulePath - value: '/modules/Microsoft.Authorization/policyDefinitions' + value: '/modules/Authorization/policyDefinitions' stages: - template: /.azuredevops/pipelineTemplates/stages.module.yml diff --git a/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml b/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml index ae9b8f06ee..530075948f 100644 --- a/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml +++ b/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml @@ -29,7 +29,7 @@ trigger: include: - '/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml' - '/.azuredevops/pipelineTemplates/*.yml' - - '/modules/Microsoft.Authorization/policyExemptions/*' + - '/modules/Authorization/policyExemptions/*' - '/utilities/pipelines/*' exclude: - '/utilities/pipelines/deploymentRemoval/*' @@ -39,7 +39,7 @@ variables: - template: '../../settings.yml' - group: 'PLATFORM_VARIABLES' - name: modulePath - value: '/modules/Microsoft.Authorization/policyExemptions' + value: '/modules/Authorization/policyExemptions' stages: - template: /.azuredevops/pipelineTemplates/stages.module.yml diff --git a/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml index ea7756c0a2..c30697998e 100644 --- a/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml +++ b/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml @@ -29,7 +29,7 @@ trigger: include: - '/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml' - '/.azuredevops/pipelineTemplates/*.yml' - - '/modules/Microsoft.Authorization/policySetDefinitions/*' + - '/modules/Authorization/policySetDefinitions/*' - '/utilities/pipelines/*' exclude: - '/utilities/pipelines/deploymentRemoval/*' @@ -39,7 +39,7 @@ variables: - template: '../../settings.yml' - group: 'PLATFORM_VARIABLES' - name: modulePath - value: '/modules/Microsoft.Authorization/policySetDefinitions' + value: '/modules/Authorization/policySetDefinitions' stages: - template: /.azuredevops/pipelineTemplates/stages.module.yml diff --git a/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml b/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml index ee575a2fbb..7c30e298ac 100644 --- a/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml +++ b/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml @@ -29,7 +29,7 @@ trigger: include: - '/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml' - '/.azuredevops/pipelineTemplates/*.yml' - - '/modules/Microsoft.Authorization/roleAssignments/*' + - '/modules/Authorization/roleAssignments/*' - '/utilities/pipelines/*' exclude: - '/utilities/pipelines/deploymentRemoval/*' @@ -39,7 +39,7 @@ variables: - template: '../../settings.yml' - group: 'PLATFORM_VARIABLES' - name: modulePath - value: '/modules/Microsoft.Authorization/roleAssignments' + value: '/modules/Authorization/roleAssignments' stages: - template: /.azuredevops/pipelineTemplates/stages.module.yml diff --git a/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml index a54e8bb560..c1c0dc7544 100644 --- a/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml +++ b/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml @@ -29,7 +29,7 @@ trigger: include: - '/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml' - '/.azuredevops/pipelineTemplates/*.yml' - - '/modules/Microsoft.Authorization/roleDefinitions/*' + - '/modules/Authorization/roleDefinitions/*' - '/utilities/pipelines/*' exclude: - '/utilities/pipelines/deploymentRemoval/*' @@ -39,7 +39,7 @@ variables: - template: '../../settings.yml' - group: 'PLATFORM_VARIABLES' - name: modulePath - value: '/modules/Microsoft.Authorization/roleDefinitions' + value: '/modules/Authorization/roleDefinitions' stages: - template: /.azuredevops/pipelineTemplates/stages.module.yml From 04f061575ec25b64f4064baa95a363b5061cce0e Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 20:25:24 +0200 Subject: [PATCH 41/63] authorization workflow 2 --- .github/workflows/ms.authorization.locks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ms.authorization.locks.yml b/.github/workflows/ms.authorization.locks.yml index 37ef5fcf3b..b4cdf2cf33 100644 --- a/.github/workflows/ms.authorization.locks.yml +++ b/.github/workflows/ms.authorization.locks.yml @@ -30,13 +30,13 @@ on: - '.github/actions/templates/**' - '.github/workflows/template.module.yml' - '.github/workflows/ms.authorization.locks.yml' - - 'modules/Microsoft.Authorization/locks/**' + - 'modules/Authorization/locks/**' - 'utilities/pipelines/**' - '!utilities/pipelines/deploymentRemoval/**' - '!*/**/readme.md' env: - modulePath: 'modules/Microsoft.Authorization/locks' + modulePath: 'modules/Authorization/locks' workflowPath: '.github/workflows/ms.authorization.locks.yml' concurrency: From d2343e573fc7d8ba5336e68c997375a74b5ffd0f Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 20:36:52 +0200 Subject: [PATCH 42/63] remove comments --- utilities/pipelines/staticValidation/module.tests.ps1 | 2 -- utilities/tools/Set-ModuleReadMe.ps1 | 1 - 2 files changed, 3 deletions(-) diff --git a/utilities/pipelines/staticValidation/module.tests.ps1 b/utilities/pipelines/staticValidation/module.tests.ps1 index 4ef4a45457..e507d7680f 100644 --- a/utilities/pipelines/staticValidation/module.tests.ps1 +++ b/utilities/pipelines/staticValidation/module.tests.ps1 @@ -168,7 +168,6 @@ Describe 'Pipeline tests' -Tag 'Pipeline' { $workflowsFolderName = Join-Path $repoRootPath '.github' 'workflows' $workflowFileName = 'ms.{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('-', '').ToLower() - # $workflowFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() $workflowPath = Join-Path $workflowsFolderName $workflowFileName Test-Path $workflowPath | Should -Be $true -Because "path [$workflowPath] should exist." } @@ -188,7 +187,6 @@ Describe 'Pipeline tests' -Tag 'Pipeline' { } $workflowsFolderName = Join-Path $repoRootPath '.github' 'workflows' - # $workflowFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() $workflowFileName = 'ms.{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('-', '').ToLower() $workflowFilePath = Join-Path $workflowsFolderName $workflowFileName $workflowContent = Get-Content -Path $workflowFilePath diff --git a/utilities/tools/Set-ModuleReadMe.ps1 b/utilities/tools/Set-ModuleReadMe.ps1 index 288ef90a2d..00703e5717 100644 --- a/utilities/tools/Set-ModuleReadMe.ps1 +++ b/utilities/tools/Set-ModuleReadMe.ps1 @@ -994,7 +994,6 @@ function Set-DeploymentExamplesSection { # [3/6] Format header, remove scope property & any empty line $rawBicepExample = $rawBicepExampleString -split '\n' $rawBicepExample[0] = "module $resourceType './$moduleRelative/main.bicep' = {" - # $rawBicepExample[0] = "module $resourceType './$FullModuleIdentifier/deploy.bicep' = {" $rawBicepExample = $rawBicepExample | Where-Object { $_ -notmatch 'scope: *' } | Where-Object { -not [String]::IsNullOrEmpty($_) } # [4/6] Extract param block From 5275f1549354c10920a5f37ed7435389872fac5d Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 20:37:35 +0200 Subject: [PATCH 43/63] update ado docs --- .../pipelineTemplates/jobs.validateModuleDeployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml b/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml index df7fb6362a..8088092413 100644 --- a/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml +++ b/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml @@ -29,7 +29,7 @@ ## | vmImage | '$(vmImage)' | You can provide either a [poolname] or [vmImage] to run the job on. | 'ubuntu20.04' | ## | defaultJobTimeoutInMinutes | 120 | The timeout for the job in this pipeline. | 120 | ## | removeDeployment | 'true' | Set to [true] to flag resources for removal. If not provided, defaults to true. | 'true' | -## | templateFilePath | '' | Path to the template file to deploy. | 'arm/Microsoft.AnalysisServices/servers/main.bicep' | +## | templateFilePath | '' | Path to the template file to deploy. | 'modules/AnalysisServices/servers/main.bicep' | ## | customTokens | '' | Additional token pairs in json format. | '{"tokenName":"tokenValue"}' | ## | jobDisplayName | '' | The display name of the job. | 'Deploy module' | ## | modulePath | '$(modulePath)' | The path to the module to deploy. | 'c:/KeyVault' | From 4475d41d0bd1e15675943816009ba50624e72829 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 20:41:56 +0200 Subject: [PATCH 44/63] update gh readme comments --- .azuredevops/platformPipelines/platform.updateReadMe.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.azuredevops/platformPipelines/platform.updateReadMe.yml b/.azuredevops/platformPipelines/platform.updateReadMe.yml index e0520cb787..739a6de199 100644 --- a/.azuredevops/platformPipelines/platform.updateReadMe.yml +++ b/.azuredevops/platformPipelines/platform.updateReadMe.yml @@ -38,7 +38,7 @@ jobs: - checkout: self persistCredentials: true - # Update the root ReadMe Module Pipelines table ([`/readme.md`](https://github.com/Azure/ResourceModules/blob/main/README.md)) + # Update the root ReadMe Module Pipelines table ([`/README.md`](https://github.com/Azure/ResourceModules/blob/main/README.md)) - task: PowerShell@2 displayName: 'Update Module Pipelines table' inputs: @@ -64,7 +64,7 @@ jobs: Set-ReadMeModuleTable @functionInput -Verbose - # Update the `modules` folder ReadMe ([`/modules/readme.md`](https://github.com/Azure/ResourceModules/blob/main/modules/README.md)) + # Update the `modules` folder ReadMe ([`/modules/README.md`](https://github.com/Azure/ResourceModules/blob/main/modules/README.md)) - task: PowerShell@2 displayName: 'Update module folder ReadMe' inputs: @@ -109,7 +109,7 @@ jobs: Set-ModuleOverviewTable @functionInput -Verbose - # Update the root ReadMe Platform Pipelines table ([`/readme.md`](https://github.com/Azure/ResourceModules/blob/main/README.md)) + # Update the root ReadMe Platform Pipelines table ([`/README.md`](https://github.com/Azure/ResourceModules/blob/main/README.md)) - task: PowerShell@2 displayName: 'Update Platform Pipelines table' inputs: From 22318901265fd031bcb97c50f48af2083392c5a2 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 20:43:41 +0200 Subject: [PATCH 45/63] update gh docs --- .github/actions/templates/publishModule/action.yml | 2 +- .github/actions/templates/validateModuleDeployment/action.yml | 2 +- .github/actions/templates/validateModulePSRule/action.yml | 2 +- .github/actions/templates/validateModulePester/action.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/templates/publishModule/action.yml b/.github/actions/templates/publishModule/action.yml index 3a3ad7d692..5aabf54567 100644 --- a/.github/actions/templates/publishModule/action.yml +++ b/.github/actions/templates/publishModule/action.yml @@ -15,7 +15,7 @@ ## |===========================================================================================================================================================================================================| ## | Parameter | Required | Default | Description | Example | ## |--------------------------|----------|---------|--------------------------------------------------------------------------------------------------|--------------------------------------------------------| -## | templateFilePath | true | '' | The path to the template file to publish | 'modules/Microsoft.ApiManagement/service/main.bicep' | +## | templateFilePath | true | '' | The path to the template file to publish | 'modules/ApiManagement/service/main.bicep' | ## | templateSpecsRgName | false | '' | Required to publish to template spec. ResourceGroup of the template spec to publish to | 'artifacts-rg' | ## | templateSpecsRgLocation | false | '' | Required to publish to template spec. Location of the template spec resource group | 'WestEurope' | ## | templateSpecsDescription | false | '' | Required to publish to template spec. Description of the template spec to publish to | 'This is an API-Management service template' | diff --git a/.github/actions/templates/validateModuleDeployment/action.yml b/.github/actions/templates/validateModuleDeployment/action.yml index 0a7760a528..5b7c690efa 100644 --- a/.github/actions/templates/validateModuleDeployment/action.yml +++ b/.github/actions/templates/validateModuleDeployment/action.yml @@ -14,7 +14,7 @@ ## |=====================================================================================================================================================================================| ## | Parameter | Required | Default | Description | Example | ## |---------------------------|----------|---------|-------------------------------------------------------|----------------------------------------------------------------------------| -## | templateFilePath | true | '' | The path to the template file to use for deployment | 'modules/Microsoft.ApiManagement/service/main.bicep' | +## | templateFilePath | true | '' | The path to the template file to use for deployment | 'modules/ApiManagement/service/main.bicep' | ## | location | true | '' | The location to use for deployment | 'WestEurope' | ## | subscriptionId | false | '' | The subscriptionId to deploy to | '1a97b80a-4dda-4f50-ab53-349e29344654' | ## | managementGroupId | false | '' | The managementGroupId to deploy to | '1a97b80a-4dda-4f50-ab53-349e29344654' | diff --git a/.github/actions/templates/validateModulePSRule/action.yml b/.github/actions/templates/validateModulePSRule/action.yml index badc4b37f6..0a27bd7bac 100644 --- a/.github/actions/templates/validateModulePSRule/action.yml +++ b/.github/actions/templates/validateModulePSRule/action.yml @@ -13,7 +13,7 @@ ## |=================================================================================================================================================================| ## | Parameter | Required | Default | Description | Example | ## |--------------------------|----------|---------|--------------------------------------|--------------------------------------------------------------------------| -## | templateFilePath | true | '' | The path to the module PSRule tests. | 'modules/Microsoft.ApiManagement/service/.test/common/main.test.bicep' | +## | templateFilePath | true | '' | The path to the module PSRule tests. | 'modules/ApiManagement/service/.test/common/main.test.bicep' | ## | subscriptionId | false | '' | The subscriptionId to deploy to | '1a97b80a-4dda-4f50-ab53-349e29344654' | ## | managementGroupId | false | '' | The managementGroupId to deploy to | '1a97b80a-4dda-4f50-ab53-349e29344654' | ## |=================================================================================================================================================================| diff --git a/.github/actions/templates/validateModulePester/action.yml b/.github/actions/templates/validateModulePester/action.yml index 765f7cf989..968766c470 100644 --- a/.github/actions/templates/validateModulePester/action.yml +++ b/.github/actions/templates/validateModulePester/action.yml @@ -13,7 +13,7 @@ ## |==================================================================================================================================================| ## | Parameter | Required | Default | Description | Example | ## |--------------------------|----------|---------|--------------------------------------|-----------------------------------------------------------| -## | modulePath | true | '' | The path to the module's folder | 'modules/Microsoft.ApiManagement/service' | +## | modulePath | true | '' | The path to the module's folder | 'modules/ApiManagement/service' | ## | moduleTestFilePath | true | '' | The path to the module Pester tests. | 'utilities/pipelines/staticValidation/module.tests.ps1' | ## |==================================================================================================================================================| ## From 75627e9ab59cb7726fd78589f2274c6b3bef25c4 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 20:45:33 +0200 Subject: [PATCH 46/63] update gh readme comments --- .github/workflows/platform.updateReadMe.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/platform.updateReadMe.yml b/.github/workflows/platform.updateReadMe.yml index 001b05c016..ff4c223c64 100644 --- a/.github/workflows/platform.updateReadMe.yml +++ b/.github/workflows/platform.updateReadMe.yml @@ -32,7 +32,7 @@ jobs: fetch-depth: 0 token: '${{ secrets.PLATFORM_REPO_UPDATE_PAT }}' # Sets general GIT credentials up - # Update the root ReadMe Module Pipelines table ([`/readme.md`](https://github.com/Azure/ResourceModules/blob/main/README.md)) + # Update the root ReadMe Module Pipelines table ([`/README.md`](https://github.com/Azure/ResourceModules/blob/main/README.md)) - name: 'Update Module Pipelines table' shell: pwsh run: | @@ -54,7 +54,7 @@ jobs: Set-ReadMeModuleTable @functionInput -Verbose - # Update the `modules` folder ReadMe ([`/modules/readme.md`](https://github.com/Azure/ResourceModules/blob/main/modules/README.md)) + # Update the `modules` folder ReadMe ([`/modules/README.md`](https://github.com/Azure/ResourceModules/blob/main/modules/README.md)) - name: 'Update module folder ReadMe' shell: pwsh run: | @@ -92,7 +92,7 @@ jobs: Set-ModuleOverviewTable @functionInput -Verbose - # Update the root ReadMe Platform Pipelines table ([`/readme.md`](https://github.com/Azure/ResourceModules/blob/main/README.md)) + # Update the root ReadMe Platform Pipelines table ([`/README.md`](https://github.com/Azure/ResourceModules/blob/main/README.md)) - name: 'Update Platform Pipelines table' shell: pwsh run: | From 31abd68f7efd3e04e2de3bb08a8d4e2257809c8f Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 20:53:23 +0200 Subject: [PATCH 47/63] update docs --- ...board module library and CI environment.md | 6 ++--- docs/wiki/Solution creation.md | 24 +++++++++---------- docs/wiki/The library - Module design.md | 4 ++-- docs/wiki/The library - Module usage.md | 18 +++++++------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/docs/wiki/Getting started - Scenario 2 Onboard module library and CI environment.md b/docs/wiki/Getting started - Scenario 2 Onboard module library and CI environment.md index 515c180bd6..1baefcb4c2 100644 --- a/docs/wiki/Getting started - Scenario 2 Onboard module library and CI environment.md +++ b/docs/wiki/Getting started - Scenario 2 Onboard module library and CI environment.md @@ -394,9 +394,9 @@ Finally, the elements described above must further be configured in the followin | File | Parameter | Notes | | - | - | - | -| `modules/Microsoft.Web/sites/.test/common/main.bicep` | `appSettingsKeyValuePairs.EASYAUTH_SECRET` | Key Vault secret URI without version (e.g., 'https://Test-KeyVault.vault.azure.net/secrets/aBcDeFghIjK69Ln') | -| `modules/Microsoft.Web/sites/.test/common/main.bicep` | `authSettingV2Configuration.identityProviders.azureActiveDirectory.registration.clientId` | App ID from the Azure Active Directory App (e.g., '11111111-1111-1111-1111-11111111111') | -| `modules/Microsoft.Web/sites/.test/common/main.bicep` | `authSettingV2Configuration.identityProviders.azureActiveDirectory.validation.allowedAudiences` | API endpoint from the Azure Active Directory app (e.g., 'api://11111111-1111-1111-1111-11111111111') | +| `modules/Web/sites/.test/common/main.bicep` | `appSettingsKeyValuePairs.EASYAUTH_SECRET` | Key Vault secret URI without version (e.g., 'https://Test-KeyVault.vault.azure.net/secrets/aBcDeFghIjK69Ln') | +| `modules/Web/sites/.test/common/main.bicep` | `authSettingV2Configuration.identityProviders.azureActiveDirectory.registration.clientId` | App ID from the Azure Active Directory App (e.g., '11111111-1111-1111-1111-11111111111') | +| `modules/Web/sites/.test/common/main.bicep` | `authSettingV2Configuration.identityProviders.azureActiveDirectory.validation.allowedAudiences` | API endpoint from the Azure Active Directory app (e.g., 'api://11111111-1111-1111-1111-11111111111') | # 5. (Optional) Convert library to ARM diff --git a/docs/wiki/Solution creation.md b/docs/wiki/Solution creation.md index 007a3440b9..66ed9ff3c7 100644 --- a/docs/wiki/Solution creation.md +++ b/docs/wiki/Solution creation.md @@ -140,8 +140,8 @@ Once you start building a solution using this library, you may wonder how best t - Use the [VS-Code extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-bicep) for Bicep to enable DSL-native features such as auto-complete. Metadata implemented in the modules are automatically loaded through the extension. - Use the readme - - If you don't know how to use an object/array parameter, you can check if the module's ReadMe file specifies any 'Parameter Usage' block for the given parameter ([example](https://github.com/Azure/ResourceModules/blob/main/modules/Microsoft.AnalysisServices/servers/README.md#parameter-usage-tags)) - or - check the module's `Deployment Examples` ([example](https://github.com/Azure/ResourceModules/blob/main/modules/Microsoft.AnalysisServices/servers/README.md#deployment-examples)). - - In general, take note of the `Deployment Examples` specified in each module's ReadMe file, as they provide you with rich & tested examples of how a given module can be deployed ([example](https://github.com/Azure/ResourceModules/blob/main/modules/Microsoft.AnalysisServices/servers/README.md#deployment-examples)). An easy way to get started is to copy one of the examples and then adjust it to your needs. + - If you don't know how to use an object/array parameter, you can check if the module's ReadMe file specifies any 'Parameter Usage' block for the given parameter ([example](https://github.com/Azure/ResourceModules/blob/main/modules/AnalysisServices/servers/README.md#parameter-usage-tags)) - or - check the module's `Deployment Examples` ([example](https://github.com/Azure/ResourceModules/blob/main/modules/AnalysisServices/servers/README.md#deployment-examples)). + - In general, take note of the `Deployment Examples` specified in each module's ReadMe file, as they provide you with rich & tested examples of how a given module can be deployed ([example](https://github.com/Azure/ResourceModules/blob/main/modules/AnalysisServices/servers/README.md#deployment-examples)). An easy way to get started is to copy one of the examples and then adjust it to your needs. - Note the outputs that are returned by each module. - If an output you need isn't available, you have 2 choices: 1. Add the missing output to the module @@ -173,7 +173,7 @@ param location string = deployment().location // =========== // // Resource Group -module rg 'modules/Microsoft.Resources/resourceGroups/main.bicep' = { +module rg 'modules/Resources/resourceGroups/main.bicep' = { name: 'registry-rg' params: { name: resourceGroupName @@ -182,7 +182,7 @@ module rg 'modules/Microsoft.Resources/resourceGroups/main.bicep' = { } // Network Security Group -module nsg 'modules/Microsoft.Network/networkSecurityGroups/main.bicep' = { +module nsg 'modules/Network/networkSecurityGroups/main.bicep' = { name: 'registry-nsg' scope: resourceGroup(resourceGroupName) params: { @@ -194,7 +194,7 @@ module nsg 'modules/Microsoft.Network/networkSecurityGroups/main.bicep' = { } // Virtual Network -module vnet 'modules/Microsoft.Network/virtualNetworks/main.bicep' = { +module vnet 'modules/Network/virtualNetworks/main.bicep' = { name: 'registry-vnet' scope: resourceGroup(resourceGroupName) params: { @@ -475,7 +475,7 @@ jobs: - name: 'Deploy resource group' uses: ./.github/actions/templates/validateModuleDeployment with: - templateFilePath: './modules/Microsoft.Resources/resourceGroups/main.bicep' + templateFilePath: './modules/Resources/resourceGroups/main.bicep' parameterFilePath: './MultiRepoTestParentFolder/network-hub-rg/Parameters/ResourceGroup/parameters.json' location: '${{ env.defaultLocation }}' resourceGroupName: '${{ env.resourceGroupName }}' @@ -486,7 +486,7 @@ jobs: - name: 'Deploy network security group' uses: ./.github/actions/templates/validateModuleDeployment with: - templateFilePath: './modules/Microsoft.Network/networkSecurityGroups/main.bicep' + templateFilePath: './modules/Network/networkSecurityGroups/main.bicep' parameterFilePath: './MultiRepoTestParentFolder/network-hub-rg/Parameters/NetworkSecurityGroups/parameters.json' location: '${{ env.defaultLocation }}' resourceGroupName: '${{ env.resourceGroupName }}' @@ -497,7 +497,7 @@ jobs: - name: 'Deploy virtual network A' uses: ./.github/actions/templates/validateModuleDeployment with: - templateFilePath: './modules/Microsoft.Network/virtualNetworks/main.bicep' + templateFilePath: './modules/Network/virtualNetworks/main.bicep' parameterFilePath: './MultiRepoTestParentFolder/network-hub-rg/Parameters/VirtualNetwork/vnet-A.parameters.json' location: '${{ env.defaultLocation }}' resourceGroupName: '${{ env.resourceGroupName }}' @@ -562,7 +562,7 @@ stages: parameters: jobName: resourceGroups displayName: 'Resource Group' - modulePath: '/modules/Microsoft.Resources/resourceGroups/main.bicep' + modulePath: '/modules/Resources/resourceGroups/main.bicep' moduleTestFilePath: '$(resourceGroupName)/parameters.json' checkoutRepositories: - modules @@ -570,7 +570,7 @@ stages: parameters: jobName: networkSecurityGroups displayName: 'Network Security Groups' - modulePath: '/modules/Microsoft.Network/networkSecurityGroups/main.bicep' + modulePath: '/modules/Network/networkSecurityGroups/main.bicep' moduleTestFilePath: '$(resourceGroupName)/networkSecurityGroups/parameters.json' checkoutRepositories: - modules @@ -578,7 +578,7 @@ stages: parameters: jobName: routeTables displayName: 'Route Tables' - modulePath: '/modules/Microsoft.Network/routeTables/main.bicep' + modulePath: '/modules/Network/routeTables/main.bicep' moduleTestFilePath: '$(resourceGroupName)/routeTables/parameters.json' checkoutRepositories: - modules @@ -586,7 +586,7 @@ stages: parameters: jobName: virtualNetworks displayName: 'Virtual Networks' - modulePath: '/modules/Microsoft.Network/virtualNetworks/main.bicep' + modulePath: '/modules/Network/virtualNetworks/main.bicep' moduleTestFilePath: '$(resourceGroupName)/virtualNetworks/parameters.json' checkoutRepositories: - modules diff --git a/docs/wiki/The library - Module design.md b/docs/wiki/The library - Module design.md index 923643924f..75e68a49cd 100644 --- a/docs/wiki/The library - Module design.md +++ b/docs/wiki/The library - Module design.md @@ -591,7 +591,7 @@ Test file (`main.test.bicep`) guidelines: - References to dependencies should be implemented using resource references in combination with outputs. In other words: You should not hardcode any references into the module template's deployment. Instead use references such as `nestedDependencies.outputs.managedIdentityPrincipalId` - If any diagnostic resources (e.g., a Log Analytics workspace) are required for a test scenario, you can reference the centralized `modules/.shared/.templates/diagnostic.dependencies.bicep` template. It will also provide you with all outputs you'd need. -> :scroll: [Example of test file](https://github.com/Azure/ResourceModules/blob/main/modules/Microsoft.AnalysisServices/servers/.test/common/main.test.bicep) +> :scroll: [Example of test file](https://github.com/Azure/ResourceModules/blob/main/modules/AnalysisServices/servers/.test/common/main.test.bicep) Dependency file (`dependencies.bicep`) guidelines: @@ -600,7 +600,7 @@ Dependency file (`dependencies.bicep`) guidelines: - A special case to point out is the implementation of Key Vaults that require purge protection (for example, for Customer Managed Keys). As this implies that we cannot fully clean up a test deployment, it is recommended to generate a new name for this resource upon each pipeline run using the output of the `utcNow()` function at the time. - > :scroll: [Example of test using purge protected Key Vault dependency](https://github.com/Azure/ResourceModules/tree/main/modules/Microsoft.Batch/batchAccounts/.test/encr) + > :scroll: [Example of test using purge protected Key Vault dependency](https://github.com/Azure/ResourceModules/tree/main/modules/Batch/batchAccounts/.test/encr) - If you need a Deployment Script to set additional non-template resources up (for example certificates/files, etc.), we recommend to store it as a file in the shared `modules/.shared/.scripts` folder and load it using the template function `loadTextContent()` (for example: `scriptContent: loadTextContent('../../../../.shared/.scripts/New-SSHKey.ps1')`). This approach makes it easier to test & validate the logic and further allows reusing the same logic accross multiple test cases. diff --git a/docs/wiki/The library - Module usage.md b/docs/wiki/The library - Module usage.md index 5f001ec519..a9ed5e9495 100644 --- a/docs/wiki/The library - Module usage.md +++ b/docs/wiki/The library - Module usage.md @@ -37,7 +37,7 @@ $inputObject = @{ # Using a local reference TemplateFile = "$home\ResourceModules\modules\Microsoft.KeyVault\vault\main.bicep" # Using a remote reference - # TemplateUri = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.KeyVault/vaults/main.bicep' + # TemplateUri = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/KeyVault/vaults/main.bicep' } New-AzResourceGroupDeployment @inputObject ``` @@ -61,7 +61,7 @@ $inputObject = @{ # Using a local reference TemplateFile = "$home\ResourceModules\modules\Microsoft.Resources\resourceGroups\main.bicep" # Using a remote reference - # TemplateUri = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Resources/resourceGroups/main.bicep' + # TemplateUri = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Resources/resourceGroups/main.bicep' } New-AzDeployment @inputObject ``` @@ -86,7 +86,7 @@ $inputObject = @{ # Using a local reference TemplateFile = "$home\ResourceModules\modules\Microsoft.Authorization\policyAssignments\managementGroup\main.bicep" # Using a remote reference - # TemplateUri = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Authorization/policyAssignments/managementGroup/main.bicep' + # TemplateUri = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Authorization/policyAssignments/managementGroup/main.bicep' } New-AzManagementGroupDeployment @inputObject ``` @@ -110,7 +110,7 @@ $inputObject = @{ # Using a local reference TemplateFile = "$home\ResourceModules\modules\Microsoft.Subscription\aliases\main.bicep" # Using a remote reference - # TemplateUri = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Subscription/aliases/main.bicep' + # TemplateUri = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Subscription/aliases/main.bicep' } New-AzTenantDeployment @inputObject ``` @@ -137,7 +137,7 @@ $inputObject = @( # Using a local reference '--template-file', "$home\ResourceModules\modules\Microsoft.Storage\storageAccounts\main.bicep", # Using a remote reference - # '--template-uri', 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Storage/storageAccounts/main.bicep' + # '--template-uri', 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Storage/storageAccounts/main.bicep' ) az deployment group create @inputObject ``` @@ -161,7 +161,7 @@ $inputObject = @( # Using a local reference '--template-file', "$home\ResourceModules\modules\Microsoft.Resources\resourceGroups\main.bicep" # Using a remote reference - # '--template-uri', 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Resources/resourceGroups/main.bicep' + # '--template-uri', 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Resources/resourceGroups/main.bicep' ) az deployment sub create @inputObject ``` @@ -186,7 +186,7 @@ $inputObject = @( # Using a local reference '--template-file', "$home\ResourceModules\modules\Microsoft.Authorization\policyAssignments\managementGroup\main.bicep" # Using a remote reference - # '--template-uri', 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Authorization/policyAssignments/managementGroup/main.bicep' + # '--template-uri', 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Authorization/policyAssignments/managementGroup/main.bicep' ) az deployment mg create @inputObject ``` @@ -210,7 +210,7 @@ $inputObject = @( # Using a local reference '--template-file', "$home\ResourceModules\modules\Microsoft.Subscription\aliases\main.bicep" # Using a remote reference - # '--template-uri', 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Microsoft.Subscription/aliases/main.bicep' + # '--template-uri', 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Subscription/aliases/main.bicep' ) az deployment tenant create @inputObject ``` @@ -225,7 +225,7 @@ You can also reference modules in another template using the below syntax. To de ```bicep // Using local reference -module testDeployment 'ResourceModules/modules/Microsoft.KeyVaults/vaults/main.bicep' = { +module testDeployment 'ResourceModules/modules/KeyVaults/vaults/main.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-example' params: { ... } From d14568b224b98e27c444e85c3942711f85fd7760 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 21:13:34 +0200 Subject: [PATCH 48/63] update policyassignments --- modules/Authorization/policyAssignments/README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/Authorization/policyAssignments/README.md b/modules/Authorization/policyAssignments/README.md index 7308858110..37ec97dd52 100644 --- a/modules/Authorization/policyAssignments/README.md +++ b/modules/Authorization/policyAssignments/README.md @@ -189,7 +189,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep' = { +module policyAssignments './Authorization/policyAssignments/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-apamgcom' params: { // Required parameters @@ -390,7 +390,7 @@ module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep via Bicep module ```bicep -module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep' = { +module policyAssignments './Authorization/policyAssignments/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apamgmin' params: { // Required parameters @@ -439,7 +439,7 @@ module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep via Bicep module ```bicep -module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep' = { +module policyAssignments './Authorization/policyAssignments/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apargcom' params: { // Required parameters @@ -648,7 +648,7 @@ module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep via Bicep module ```bicep -module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep' = { +module policyAssignments './Authorization/policyAssignments/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apargmin' params: { // Required parameters @@ -701,7 +701,7 @@ module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep via Bicep module ```bicep -module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep' = { +module policyAssignments './Authorization/policyAssignments/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apasubcom' params: { // Required parameters @@ -906,7 +906,7 @@ module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep via Bicep module ```bicep -module policyAssignments './Microsoft.Authorization/policyAssignments/main.bicep' = { +module policyAssignments './Authorization/policyAssignments/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apasubmin' params: { // Required parameters From df4d05567d04f2cd1a4e0b8f3a1deb63f3aa7bf6 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 21:22:36 +0200 Subject: [PATCH 49/63] update set module readme --- utilities/tools/Set-ModuleReadMe.ps1 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/utilities/tools/Set-ModuleReadMe.ps1 b/utilities/tools/Set-ModuleReadMe.ps1 index 00703e5717..958a7106a2 100644 --- a/utilities/tools/Set-ModuleReadMe.ps1 +++ b/utilities/tools/Set-ModuleReadMe.ps1 @@ -1481,12 +1481,7 @@ function Set-ModuleReadMe { $splitHyphens = $moduleRelative.split('-') $splitHyphens = $splitHyphens | ForEach-Object { $_.substring(0, 1).toupper() + $_.substring(1) } $splitHyphens = $splitHyphens -join '' - # If willing to support both naming - if ($splitHyphens -match '^Microsoft\.(.)*') { - $fullModuleIdentifier = '{0}' -f $splitHyphens.Replace('-', '') - } else { - $fullModuleIdentifier = 'Microsoft.{0}' -f $splitHyphens.Replace('-', '') - } + $fullModuleIdentifier = 'Microsoft.{0}' -f $splitHyphens.Replace('-', '') # Check readme if (-not (Test-Path $ReadMeFilePath) -or ([String]::IsNullOrEmpty((Get-Content $ReadMeFilePath -Raw)))) { From 48c30b020ca610bbf541fb4cb1a388c809f87c58 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 21:27:33 +0200 Subject: [PATCH 50/63] update ado pipelines avd storage --- .../modulePipelines/ms.desktopvirtualization.hostpools.yml | 4 ++-- .../ms.desktopvirtualization.scalingplans.yml | 4 ++-- .../modulePipelines/ms.desktopvirtualization.workspaces.yml | 4 ++-- .azuredevops/modulePipelines/ms.storage.storageaccounts.yml | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml index 758ca4aec3..14ee912cc4 100644 --- a/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml +++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml @@ -29,7 +29,7 @@ trigger: include: - '/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml' - '/.azuredevops/pipelineTemplates/*.yml' - - '/modules/Microsoft.DesktopVirtualization/hostpools/*' + - '/modules/DesktopVirtualization/hostPools/*' - '/utilities/pipelines/*' exclude: - '/utilities/pipelines/deploymentRemoval/*' @@ -39,7 +39,7 @@ variables: - template: '../../settings.yml' - group: 'PLATFORM_VARIABLES' - name: modulePath - value: '/modules/Microsoft.DesktopVirtualization/hostpools' + value: '/modules/DesktopVirtualization/hostPools' stages: - template: /.azuredevops/pipelineTemplates/stages.module.yml diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml index 2987ee6399..ec60b85081 100644 --- a/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml +++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml @@ -29,7 +29,7 @@ trigger: include: - '/.azuredevops/modulePipelines/ms.desktopvirtualization.scalingplans.yml' - '/.azuredevops/pipelineTemplates/*.yml' - - '/modules/Microsoft.DesktopVirtualization/scalingplans/*' + - '/modules/DesktopVirtualization/scalingPlans/*' - '/utilities/pipelines/*' exclude: - '/utilities/pipelines/deploymentRemoval/*' @@ -39,7 +39,7 @@ variables: - template: '../../settings.yml' - group: 'PLATFORM_VARIABLES' - name: modulePath - value: '/modules/Microsoft.DesktopVirtualization/scalingplans' + value: '/modules/DesktopVirtualization/scalingPlans' stages: - template: /.azuredevops/pipelineTemplates/stages.module.yml diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml index 2eaed9716c..1c304d8cc4 100644 --- a/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml +++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml @@ -29,7 +29,7 @@ trigger: include: - '/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml' - '/.azuredevops/pipelineTemplates/*.yml' - - '/modules/Microsoft.DesktopVirtualization/workspaces/*' + - '/modules/DesktopVirtualization/workspaces/*' - '/utilities/pipelines/*' exclude: - '/utilities/pipelines/deploymentRemoval/*' @@ -39,7 +39,7 @@ variables: - template: '../../settings.yml' - group: 'PLATFORM_VARIABLES' - name: modulePath - value: '/modules/Microsoft.DesktopVirtualization/workspaces' + value: '/modules/DesktopVirtualization/workspaces' stages: - template: /.azuredevops/pipelineTemplates/stages.module.yml diff --git a/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml b/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml index f31fe084a9..6559df9433 100644 --- a/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml +++ b/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml @@ -27,8 +27,8 @@ trigger: - main paths: include: - - '/modules/Microsoft.Storage/storageAccounts/*' - - '/modules/Microsoft.Network/privateEndpoints/*' + - '/modules/Storage/storageAccounts/*' + - '/modules/Network/privateEndpoints/*' - '/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml' - '/.azuredevops/pipelineTemplates/*.yml' - '/utilities/pipelines/*' @@ -40,7 +40,7 @@ variables: - template: '../../settings.yml' - group: 'PLATFORM_VARIABLES' - name: modulePath - value: '/modules/Microsoft.Storage/storageAccounts' + value: '/modules/Storage/storageAccounts' stages: - template: /.azuredevops/pipelineTemplates/stages.module.yml From ee5e1d1aa800a288735dc498aa5f1dcf685a71db Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Mon, 8 May 2023 21:56:02 +0200 Subject: [PATCH 51/63] Remove Microsoft prefix from all modules --- .../DomainServices/.bicep/nested_roleAssignments.bicep | 0 .../DomainServices/.test/common/dependencies.bicep | 0 .../DomainServices/.test/common/main.test.bicep | 0 .../DomainServices/readme.md => AAD/DomainServices/README.md} | 0 modules/{Microsoft.AAD => AAD}/DomainServices/main.bicep | 0 modules/{Microsoft.AAD => AAD}/DomainServices/version.json | 0 .../servers/.bicep/nested_roleAssignments.bicep | 0 .../servers/.test/common/dependencies.bicep | 0 .../servers/.test/common/main.test.bicep | 0 .../servers/.test/max/dependencies.bicep | 0 .../servers/.test/max/main.test.bicep | 0 .../servers/.test/min/main.test.bicep | 0 .../servers/readme.md => AnalysisServices/servers/README.md} | 0 .../servers/main.bicep | 0 .../servers/version.json | 0 .../service/.bicep/nested_roleAssignments.bicep | 0 .../service/.test/common/dependencies.bicep | 0 .../service/.test/common/main.test.bicep | 0 .../service/.test/max/dependencies.bicep | 0 .../service/.test/max/main.test.bicep | 0 .../service/.test/min/main.test.bicep | 0 .../service/readme.md => ApiManagement/service/README.md} | 0 .../readme.md => ApiManagement/service/apiVersionSets/README.md} | 0 .../service/apiVersionSets/main.bicep | 0 .../service/apiVersionSets/version.json | 0 .../apis/readme.md => ApiManagement/service/apis/README.md} | 0 .../service/apis/main.bicep | 0 .../readme.md => ApiManagement/service/apis/policies/README.md} | 0 .../service/apis/policies/main.bicep | 0 .../service/apis/policies/version.json | 0 .../service/apis/version.json | 0 .../service/authorizationServers/README.md} | 0 .../service/authorizationServers/main.bicep | 0 .../service/authorizationServers/version.json | 0 .../readme.md => ApiManagement/service/backends/README.md} | 0 .../service/backends/main.bicep | 0 .../service/backends/version.json | 0 .../caches/readme.md => ApiManagement/service/caches/README.md} | 0 .../service/caches/main.bicep | 0 .../service/caches/version.json | 0 .../service/identityProviders/README.md} | 0 .../service/identityProviders/main.bicep | 0 .../service/identityProviders/version.json | 0 .../{Microsoft.ApiManagement => ApiManagement}/service/main.bicep | 0 .../readme.md => ApiManagement/service/namedValues/README.md} | 0 .../service/namedValues/main.bicep | 0 .../service/namedValues/version.json | 0 .../readme.md => ApiManagement/service/policies/README.md} | 0 .../service/policies/main.bicep | 0 .../service/policies/version.json | 0 .../readme.md => ApiManagement/service/portalSettings/README.md} | 0 .../service/portalSettings/main.bicep | 0 .../service/portalSettings/version.json | 0 .../readme.md => ApiManagement/service/products/README.md} | 0 .../readme.md => ApiManagement/service/products/apis/README.md} | 0 .../service/products/apis/main.bicep | 0 .../service/products/apis/version.json | 0 .../readme.md => ApiManagement/service/products/groups/README.md} | 0 .../service/products/groups/main.bicep | 0 .../service/products/groups/version.json | 0 .../service/products/main.bicep | 0 .../service/products/version.json | 0 .../readme.md => ApiManagement/service/subscriptions/README.md} | 0 .../service/subscriptions/main.bicep | 0 .../service/subscriptions/version.json | 0 .../service/version.json | 0 .../containerApps/.bicep/nested_roleAssignments.bicep | 0 .../containerApps/.test/common/dependencies.bicep | 0 .../containerApps/.test/common/main.test.bicep | 0 .../containerApps/.test/min/dependencies.bicep | 0 .../containerApps/.test/min/main.test.bicep | 0 .../containerApps/readme.md => App/containerApps/README.md} | 0 modules/{Microsoft.App => App}/containerApps/main.bicep | 0 modules/{Microsoft.App => App}/containerApps/version.json | 0 .../managedEnvironments/.bicep/nested_roleAssignments.bicep | 0 .../managedEnvironments/.test/common/dependencies.bicep | 0 .../managedEnvironments/.test/common/main.test.bicep | 0 .../managedEnvironments/.test/min/dependencies.bicep | 0 .../managedEnvironments/.test/min/main.test.bicep | 0 .../readme.md => App/managedEnvironments/README.md} | 0 modules/{Microsoft.App => App}/managedEnvironments/main.bicep | 0 modules/{Microsoft.App => App}/managedEnvironments/version.json | 0 .../configurationStores/.bicep/nested_roleAssignments.bicep | 0 .../configurationStores/.test/common/dependencies.bicep | 0 .../configurationStores/.test/common/main.test.bicep | 0 .../configurationStores/.test/min/main.test.bicep | 0 .../configurationStores/.test/pe/dependencies.bicep | 0 .../configurationStores/.test/pe/main.test.bicep | 0 .../readme.md => AppConfiguration/configurationStores/README.md} | 0 .../keyValues/.bicep/nested_roleAssignments.bicep | 0 .../configurationStores/keyValues/README.md} | 0 .../configurationStores/keyValues/main.bicep | 0 .../configurationStores/keyValues/version.json | 0 .../configurationStores/main.bicep | 0 .../configurationStores/version.json | 0 .../automationAccounts/.bicep/nested_roleAssignments.bicep | 0 .../automationAccounts/.test/common/dependencies.bicep | 0 .../automationAccounts/.test/common/main.test.bicep | 0 .../automationAccounts/.test/encr/dependencies.bicep | 0 .../automationAccounts/.test/encr/main.test.bicep | 0 .../automationAccounts/.test/min/main.test.bicep | 0 .../readme.md => Automation/automationAccounts/README.md} | 0 .../automationAccounts/jobSchedules/README.md} | 0 .../automationAccounts/jobSchedules/main.bicep | 0 .../automationAccounts/jobSchedules/version.json | 0 .../automationAccounts/main.bicep | 0 .../readme.md => Automation/automationAccounts/modules/README.md} | 0 .../automationAccounts/modules/main.bicep | 0 .../automationAccounts/modules/version.json | 0 .../automationAccounts/runbooks/README.md} | 0 .../automationAccounts/runbooks/main.bicep | 0 .../automationAccounts/runbooks/version.json | 0 .../automationAccounts/schedules/README.md} | 0 .../automationAccounts/schedules/main.bicep | 0 .../automationAccounts/schedules/version.json | 0 .../automationAccounts/softwareUpdateConfigurations/README.md} | 0 .../automationAccounts/softwareUpdateConfigurations/main.bicep | 0 .../automationAccounts/softwareUpdateConfigurations/version.json | 0 .../automationAccounts/variables/README.md} | 0 .../automationAccounts/variables/main.bicep | 0 .../automationAccounts/variables/version.json | 0 .../automationAccounts/version.json | 0 .../batchAccounts/.test/common/dependencies.bicep | 0 .../batchAccounts/.test/common/main.test.bicep | 0 .../batchAccounts/.test/encr/dependencies.bicep | 0 .../batchAccounts/.test/encr/main.test.bicep | 0 .../batchAccounts/.test/min/dependencies.bicep | 0 .../batchAccounts/.test/min/main.test.bicep | 0 .../batchAccounts/readme.md => Batch/batchAccounts/README.md} | 0 modules/{Microsoft.Batch => Batch}/batchAccounts/main.bicep | 0 modules/{Microsoft.Batch => Batch}/batchAccounts/version.json | 0 .../profiles/.bicep/nested_roleAssignments.bicep | 0 .../profiles/.test/common/dependencies.bicep | 0 .../{Microsoft.CDN => CDN}/profiles/.test/common/main.test.bicep | 0 .../{Microsoft.CDN/profiles/readme.md => CDN/profiles/README.md} | 0 .../endpoints/readme.md => CDN/profiles/endpoints/README.md} | 0 modules/{Microsoft.CDN => CDN}/profiles/endpoints/main.bicep | 0 .../readme.md => CDN/profiles/endpoints/origins/README.md} | 0 .../{Microsoft.CDN => CDN}/profiles/endpoints/origins/main.bicep | 0 .../profiles/endpoints/origins/version.json | 0 modules/{Microsoft.CDN => CDN}/profiles/endpoints/version.json | 0 modules/{Microsoft.CDN => CDN}/profiles/main.bicep | 0 modules/{Microsoft.CDN => CDN}/profiles/version.json | 0 .../redis/.bicep/nested_roleAssignments.bicep | 0 .../redis/.test/common/dependencies.bicep | 0 .../{Microsoft.Cache => Cache}/redis/.test/common/main.test.bicep | 0 .../{Microsoft.Cache => Cache}/redis/.test/min/main.test.bicep | 0 .../{Microsoft.Cache/redis/readme.md => Cache/redis/README.md} | 0 modules/{Microsoft.Cache => Cache}/redis/main.bicep | 0 modules/{Microsoft.Cache => Cache}/redis/version.json | 0 .../accounts/.bicep/nested_roleAssignments.bicep | 0 .../accounts/.test/common/dependencies.bicep | 0 .../accounts/.test/common/main.test.bicep | 0 .../accounts/.test/encr/dependencies.bicep | 0 .../accounts/.test/encr/main.test.bicep | 0 .../accounts/.test/min/main.test.bicep | 0 .../accounts/.test/speech/dependencies.bicep | 0 .../accounts/.test/speech/main.test.bicep | 0 .../accounts/readme.md => CognitiveServices/accounts/README.md} | 0 .../accounts/main.bicep | 0 .../accounts/version.json | 0 .../availabilitySets/.bicep/nested_roleAssignments.bicep | 0 .../availabilitySets/.test/common/dependencies.bicep | 0 .../availabilitySets/.test/common/main.test.bicep | 0 .../availabilitySets/.test/min/main.test.bicep | 0 .../readme.md => Compute/availabilitySets/README.md} | 0 .../{Microsoft.Compute => Compute}/availabilitySets/main.bicep | 0 .../{Microsoft.Compute => Compute}/availabilitySets/version.json | 0 .../diskEncryptionSets/.bicep/nested_keyVaultPermissions.bicep | 0 .../.bicep/nested_managedIdentityReference.bicep | 0 .../diskEncryptionSets/.bicep/nested_roleAssignments.bicep | 0 .../diskEncryptionSets/.test/accessPolicies/dependencies.bicep | 0 .../diskEncryptionSets/.test/accessPolicies/main.test.bicep | 0 .../diskEncryptionSets/.test/common/dependencies.bicep | 0 .../diskEncryptionSets/.test/common/main.test.bicep | 0 .../readme.md => Compute/diskEncryptionSets/README.md} | 0 .../{Microsoft.Compute => Compute}/diskEncryptionSets/main.bicep | 0 .../diskEncryptionSets/version.json | 0 .../disks/.bicep/nested_roleAssignments.bicep | 0 .../disks/.test/common/dependencies.bicep | 0 .../disks/.test/common/main.test.bicep | 0 .../disks/.test/image/dependencies.bicep | 0 .../disks/.test/image/main.test.bicep | 0 .../disks/.test/import/dependencies.bicep | 0 .../disks/.test/import/dependencies_rbac.bicep | 0 .../disks/.test/import/main.test.bicep | 0 .../disks/.test/min/main.test.bicep | 0 .../disks/readme.md => Compute/disks/README.md} | 0 modules/{Microsoft.Compute => Compute}/disks/main.bicep | 0 modules/{Microsoft.Compute => Compute}/disks/version.json | 0 .../galleries/.bicep/nested_roleAssignments.bicep | 0 .../galleries/.test/common/dependencies.bicep | 0 .../galleries/.test/common/main.test.bicep | 0 .../galleries/.test/min/main.test.bicep | 0 .../galleries/readme.md => Compute/galleries/README.md} | 0 .../galleries/applications/.bicep/nested_roleAssignments.bicep | 0 .../readme.md => Compute/galleries/applications/README.md} | 0 .../galleries/applications/main.bicep | 0 .../galleries/applications/version.json | 0 .../galleries/images/.bicep/nested_roleAssignments.bicep | 0 .../images/readme.md => Compute/galleries/images/README.md} | 0 .../{Microsoft.Compute => Compute}/galleries/images/main.bicep | 0 .../{Microsoft.Compute => Compute}/galleries/images/version.json | 0 modules/{Microsoft.Compute => Compute}/galleries/main.bicep | 0 modules/{Microsoft.Compute => Compute}/galleries/version.json | 0 .../images/.bicep/nested_roleAssignments.bicep | 0 .../images/.test/common/dependencies.bicep | 0 .../images/.test/common/dependencies_rbac.bicep | 0 .../images/.test/common/main.test.bicep | 0 .../images/readme.md => Compute/images/README.md} | 0 modules/{Microsoft.Compute => Compute}/images/main.bicep | 0 modules/{Microsoft.Compute => Compute}/images/version.json | 0 .../proximityPlacementGroups/.bicep/nested_roleAssignments.bicep | 0 .../proximityPlacementGroups/.test/common/dependencies.bicep | 0 .../proximityPlacementGroups/.test/common/main.test.bicep | 0 .../proximityPlacementGroups/.test/min/main.test.bicep | 0 .../readme.md => Compute/proximityPlacementGroups/README.md} | 0 .../proximityPlacementGroups/main.bicep | 0 .../proximityPlacementGroups/version.json | 0 .../sshPublicKeys/.bicep/nested_roleAssignments.bicep | 0 .../sshPublicKeys/.test/common/dependencies.bicep | 0 .../sshPublicKeys/.test/common/main.test.bicep | 0 .../sshPublicKeys/.test/min/main.test.bicep | 0 .../sshPublicKeys/readme.md => Compute/sshPublicKeys/README.md} | 0 modules/{Microsoft.Compute => Compute}/sshPublicKeys/main.bicep | 0 modules/{Microsoft.Compute => Compute}/sshPublicKeys/version.json | 0 .../virtualMachineScaleSets/.bicep/nested_roleAssignments.bicep | 0 .../virtualMachineScaleSets/.test/linux.min/dependencies.bicep | 0 .../virtualMachineScaleSets/.test/linux.min/main.test.bicep | 0 .../virtualMachineScaleSets/.test/linux.ssecmk/dependencies.bicep | 0 .../virtualMachineScaleSets/.test/linux.ssecmk/main.test.bicep | 0 .../virtualMachineScaleSets/.test/linux/dependencies.bicep | 0 .../virtualMachineScaleSets/.test/linux/main.test.bicep | 0 .../virtualMachineScaleSets/.test/windows.min/dependencies.bicep | 0 .../virtualMachineScaleSets/.test/windows.min/main.test.bicep | 0 .../virtualMachineScaleSets/.test/windows/dependencies.bicep | 0 .../virtualMachineScaleSets/.test/windows/main.test.bicep | 0 .../readme.md => Compute/virtualMachineScaleSets/README.md} | 0 .../virtualMachineScaleSets/extensions/README.md} | 0 .../virtualMachineScaleSets/extensions/main.bicep | 0 .../virtualMachineScaleSets/extensions/version.json | 0 .../virtualMachineScaleSets/main.bicep | 0 .../virtualMachineScaleSets/version.json | 0 .../virtualMachines/.bicep/nested_networkInterface.bicep | 0 .../virtualMachines/.bicep/nested_roleAssignments.bicep | 0 .../virtualMachines/.test/linux.atmg/dependencies.bicep | 0 .../virtualMachines/.test/linux.atmg/main.test.bicep | 0 .../virtualMachines/.test/linux.min/dependencies.bicep | 0 .../virtualMachines/.test/linux.min/main.test.bicep | 0 .../virtualMachines/.test/linux/dependencies.bicep | 0 .../virtualMachines/.test/linux/main.test.bicep | 0 .../virtualMachines/.test/windows.atmg/dependencies.bicep | 0 .../virtualMachines/.test/windows.atmg/main.test.bicep | 0 .../virtualMachines/.test/windows.min/dependencies.bicep | 0 .../virtualMachines/.test/windows.min/main.test.bicep | 0 .../virtualMachines/.test/windows.ssecmk/dependencies.bicep | 0 .../virtualMachines/.test/windows.ssecmk/main.test.bicep | 0 .../virtualMachines/.test/windows/dependencies.bicep | 0 .../virtualMachines/.test/windows/main.test.bicep | 0 .../readme.md => Compute/virtualMachines/README.md} | 0 .../readme.md => Compute/virtualMachines/extensions/README.md} | 0 .../virtualMachines/extensions/main.bicep | 0 .../virtualMachines/extensions/version.json | 0 modules/{Microsoft.Compute => Compute}/virtualMachines/main.bicep | 0 .../{Microsoft.Compute => Compute}/virtualMachines/version.json | 0 .../budgets/.test/common/main.test.bicep | 0 .../budgets/.test/min/main.test.bicep | 0 .../budgets/readme.md => Consumption/budgets/README.md} | 0 modules/{Microsoft.Consumption => Consumption}/budgets/main.bicep | 0 .../{Microsoft.Consumption => Consumption}/budgets/version.json | 0 .../containerGroups/.test/common/dependencies.bicep | 0 .../containerGroups/.test/common/main.test.bicep | 0 .../containerGroups/.test/encr/dependencies.bicep | 0 .../containerGroups/.test/encr/main.test.bicep | 0 .../containerGroups/.test/min/main.test.bicep | 0 .../containerGroups/.test/private/dependencies.bicep | 0 .../containerGroups/.test/private/main.test.bicep | 0 .../readme.md => ContainerInstance/containerGroups/README.md} | 0 .../containerGroups/main.bicep | 0 .../containerGroups/version.json | 0 .../registries/.bicep/nested_roleAssignments.bicep | 0 .../registries/.test/common/dependencies.bicep | 0 .../registries/.test/common/main.test.bicep | 0 .../registries/.test/encr/dependencies.bicep | 0 .../registries/.test/encr/main.test.bicep | 0 .../registries/.test/min/main.test.bicep | 0 .../registries/.test/pe/dependencies.bicep | 0 .../registries/.test/pe/main.test.bicep | 0 .../readme.md => ContainerRegistry/registries/README.md} | 0 .../registries/main.bicep | 0 .../registries/replications/README.md} | 0 .../registries/replications/main.bicep | 0 .../registries/replications/version.json | 0 .../registries/version.json | 0 .../readme.md => ContainerRegistry/registries/webhooks/README.md} | 0 .../registries/webhooks/main.bicep | 0 .../registries/webhooks/version.json | 0 .../managedClusters/.bicep/nested_roleAssignments.bicep | 0 .../managedClusters/.test/azure/dependencies.bicep | 0 .../managedClusters/.test/azure/main.test.bicep | 0 .../managedClusters/.test/kubenet/dependencies.bicep | 0 .../managedClusters/.test/kubenet/main.test.bicep | 0 .../managedClusters/.test/min/main.test.bicep | 0 .../readme.md => ContainerService/managedClusters/README.md} | 0 .../managedClusters/agentPools/README.md} | 0 .../managedClusters/agentPools/main.bicep | 0 .../managedClusters/agentPools/version.json | 0 .../managedClusters/main.bicep | 0 .../managedClusters/version.json | 0 .../flexibleServers/.bicep/nested_roleAssignments.bicep | 0 .../flexibleServers/.test/min/main.test.bicep | 0 .../flexibleServers/.test/private/dependencies.bicep | 0 .../flexibleServers/.test/private/main.test.bicep | 0 .../flexibleServers/.test/public/dependencies1.bicep | 0 .../flexibleServers/.test/public/dependencies2.bicep | 0 .../flexibleServers/.test/public/main.test.bicep | 0 .../readme.md => DBforMySQL/flexibleServers/README.md} | 0 .../readme.md => DBforMySQL/flexibleServers/databases/README.md} | 0 .../flexibleServers/databases/main.bicep | 0 .../flexibleServers/databases/version.json | 0 .../flexibleServers/firewallRules/README.md} | 0 .../flexibleServers/firewallRules/main.bicep | 0 .../flexibleServers/firewallRules/version.json | 0 .../flexibleServers/main.bicep | 0 .../flexibleServers/version.json | 0 .../flexibleServers/.bicep/nested_roleAssignments.bicep | 0 .../flexibleServers/.test/min/main.test.bicep | 0 .../flexibleServers/.test/private/dependencies.bicep | 0 .../flexibleServers/.test/private/main.test.bicep | 0 .../flexibleServers/.test/public/dependencies.bicep | 0 .../flexibleServers/.test/public/main.test.bicep | 0 .../readme.md => DBforPostgreSQL/flexibleServers/README.md} | 0 .../flexibleServers/configurations/README.md} | 0 .../flexibleServers/configurations/main.bicep | 0 .../flexibleServers/configurations/version.json | 0 .../flexibleServers/databases/README.md} | 0 .../flexibleServers/databases/main.bicep | 0 .../flexibleServers/databases/version.json | 0 .../flexibleServers/firewallRules/README.md} | 0 .../flexibleServers/firewallRules/main.bicep | 0 .../flexibleServers/firewallRules/version.json | 0 .../flexibleServers/main.bicep | 0 .../flexibleServers/version.json | 0 .../factories/.bicep/nested_roleAssignments.bicep | 0 .../factories/.test/common/dependencies.bicep | 0 .../factories/.test/common/main.test.bicep | 0 .../factories/.test/min/main.test.bicep | 0 .../factories/readme.md => DataFactory/factories/README.md} | 0 .../factories/integrationRuntimes/README.md} | 0 .../factories/integrationRuntimes/main.bicep | 0 .../factories/integrationRuntimes/version.json | 0 .../{Microsoft.DataFactory => DataFactory}/factories/main.bicep | 0 .../factories/managedVirtualNetworks/README.md} | 0 .../factories/managedVirtualNetworks/main.bicep | 0 .../managedVirtualNetworks/managedPrivateEndpoints/README.md} | 0 .../managedVirtualNetworks/managedPrivateEndpoints/main.bicep | 0 .../managedVirtualNetworks/managedPrivateEndpoints/version.json | 0 .../factories/managedVirtualNetworks/version.json | 0 .../{Microsoft.DataFactory => DataFactory}/factories/version.json | 0 .../backupVaults/.bicep/nested_roleAssignments.bicep | 0 .../backupVaults/.test/common/dependencies.bicep | 0 .../backupVaults/.test/common/main.test.bicep | 0 .../backupVaults/.test/min/main.test.bicep | 0 .../readme.md => DataProtection/backupVaults/README.md} | 0 .../backupVaults/backupPolicies/README.md} | 0 .../backupVaults/backupPolicies/main.bicep | 0 .../backupVaults/backupPolicies/version.json | 0 .../backupVaults/main.bicep | 0 .../backupVaults/version.json | 0 .../workspaces/.bicep/nested_roleAssignments.bicep | 0 .../workspaces/.test/common/dependencies.bicep | 0 .../workspaces/.test/common/main.test.bicep | 0 .../workspaces/readme.md => Databricks/workspaces/README.md} | 0 .../{Microsoft.Databricks => Databricks}/workspaces/main.bicep | 0 .../{Microsoft.Databricks => Databricks}/workspaces/version.json | 0 .../labs/.bicep/nested_roleAssignments.bicep | 0 .../labs/.test/common/dependencies.bicep | 0 .../labs/.test/common/main.test.bicep | 0 .../labs/.test/min/main.test.bicep | 0 .../labs/readme.md => DevTestLab/labs/README.md} | 0 .../readme.md => DevTestLab/labs/artifactSources/README.md} | 0 .../labs/artifactSources/main.bicep | 0 .../labs/artifactSources/version.json | 0 .../labs/costs/readme.md => DevTestLab/labs/costs/README.md} | 0 .../{Microsoft.DevTestLab => DevTestLab}/labs/costs/main.bicep | 0 .../{Microsoft.DevTestLab => DevTestLab}/labs/costs/version.json | 0 modules/{Microsoft.DevTestLab => DevTestLab}/labs/main.bicep | 0 .../readme.md => DevTestLab/labs/notificationChannels/README.md} | 0 .../labs/notificationChannels/main.bicep | 0 .../labs/notificationChannels/version.json | 0 .../readme.md => DevTestLab/labs/policySets/policies/README.md} | 0 .../labs/policySets/policies/main.bicep | 0 .../labs/policySets/policies/version.json | 0 .../schedules/readme.md => DevTestLab/labs/schedules/README.md} | 0 .../labs/schedules/main.bicep | 0 .../labs/schedules/version.json | 0 modules/{Microsoft.DevTestLab => DevTestLab}/labs/version.json | 0 .../readme.md => DevTestLab/labs/virtualNetworks/README.md} | 0 .../labs/virtualNetworks/main.bicep | 0 .../labs/virtualNetworks/version.json | 0 .../digitalTwinsInstances/.bicep/nested_roleAssignments.bicep | 0 .../digitalTwinsInstances/.test/common/dependencies.bicep | 0 .../digitalTwinsInstances/.test/common/main.test.bicep | 0 .../digitalTwinsInstances/.test/min/main.test.bicep | 0 .../readme.md => DigitalTwins/digitalTwinsInstances/README.md} | 0 .../digitalTwinsInstances/endpoints-eventGrid/README.md} | 0 .../digitalTwinsInstances/endpoints-eventGrid/main.bicep | 0 .../digitalTwinsInstances/endpoints-eventGrid/version.json | 0 .../digitalTwinsInstances/endpoints-eventHub/README.md} | 0 .../digitalTwinsInstances/endpoints-eventHub/main.bicep | 0 .../digitalTwinsInstances/endpoints-eventHub/version.json | 0 .../digitalTwinsInstances/endpoints-serviceBus/README.md} | 0 .../digitalTwinsInstances/endpoints-serviceBus/main.bicep | 0 .../digitalTwinsInstances/endpoints-serviceBus/version.json | 0 .../digitalTwinsInstances/main.bicep | 0 .../digitalTwinsInstances/version.json | 0 .../databaseAccounts/.bicep/nested_roleAssignments.bicep | 0 .../databaseAccounts/.test/gremlindb/dependencies.bicep | 0 .../databaseAccounts/.test/gremlindb/main.test.bicep | 0 .../databaseAccounts/.test/mongodb/dependencies.bicep | 0 .../databaseAccounts/.test/mongodb/main.test.bicep | 0 .../databaseAccounts/.test/plain/dependencies.bicep | 0 .../databaseAccounts/.test/plain/main.test.bicep | 0 .../databaseAccounts/.test/sqldb/dependencies.bicep | 0 .../databaseAccounts/.test/sqldb/main.test.bicep | 0 .../readme.md => DocumentDB/databaseAccounts/README.md} | 0 .../databaseAccounts/gremlinDatabases/README.md} | 0 .../databaseAccounts/gremlinDatabases/graphs/README.md} | 0 .../databaseAccounts/gremlinDatabases/graphs/main.bicep | 0 .../databaseAccounts/gremlinDatabases/graphs/version.json | 0 .../databaseAccounts/gremlinDatabases/main.bicep | 0 .../databaseAccounts/gremlinDatabases/version.json | 0 .../databaseAccounts/main.bicep | 0 .../databaseAccounts/mongodbDatabases/README.md} | 0 .../databaseAccounts/mongodbDatabases/collections/README.md} | 0 .../databaseAccounts/mongodbDatabases/collections/main.bicep | 0 .../databaseAccounts/mongodbDatabases/collections/version.json | 0 .../databaseAccounts/mongodbDatabases/main.bicep | 0 .../databaseAccounts/mongodbDatabases/version.json | 0 .../databaseAccounts/sqlDatabases/README.md} | 0 .../databaseAccounts/sqlDatabases/containers/README.md} | 0 .../databaseAccounts/sqlDatabases/containers/main.bicep | 0 .../databaseAccounts/sqlDatabases/containers/version.json | 0 .../databaseAccounts/sqlDatabases/main.bicep | 0 .../databaseAccounts/sqlDatabases/version.json | 0 .../databaseAccounts/version.json | 0 .../domains/.bicep/nested_roleAssignments.bicep | 0 .../domains/.test/common/dependencies.bicep | 0 .../domains/.test/common/main.test.bicep | 0 .../domains/.test/min/main.test.bicep | 0 .../domains/.test/pe/dependencies.bicep | 0 .../domains/.test/pe/main.test.bicep | 0 .../domains/readme.md => EventGrid/domains/README.md} | 0 modules/{Microsoft.EventGrid => EventGrid}/domains/main.bicep | 0 .../topics/readme.md => EventGrid/domains/topics/README.md} | 0 .../{Microsoft.EventGrid => EventGrid}/domains/topics/main.bicep | 0 .../domains/topics/version.json | 0 modules/{Microsoft.EventGrid => EventGrid}/domains/version.json | 0 .../eventSubscriptions/.test/common/dependencies.bicep | 0 .../eventSubscriptions/.test/common/main.test.bicep | 0 .../readme.md => EventGrid/eventSubscriptions/README.md} | 0 .../eventSubscriptions/main.bicep | 0 .../eventSubscriptions/version.json | 0 .../systemTopics/.bicep/nested_roleAssignments.bicep | 0 .../systemTopics/.test/common/dependencies.bicep | 0 .../systemTopics/.test/common/main.test.bicep | 0 .../systemTopics/.test/min/dependencies.bicep | 0 .../systemTopics/.test/min/main.test.bicep | 0 .../systemTopics/readme.md => EventGrid/systemTopics/README.md} | 0 .../{Microsoft.EventGrid => EventGrid}/systemTopics/main.bicep | 0 .../{Microsoft.EventGrid => EventGrid}/systemTopics/version.json | 0 .../topics/.bicep/nested_roleAssignments.bicep | 0 .../topics/.test/common/dependencies.bicep | 0 .../topics/.test/common/main.test.bicep | 0 .../topics/.test/min/main.test.bicep | 0 .../topics/.test/pe/dependencies.bicep | 0 .../topics/.test/pe/main.test.bicep | 0 .../topics/readme.md => EventGrid/topics/README.md} | 0 modules/{Microsoft.EventGrid => EventGrid}/topics/main.bicep | 0 modules/{Microsoft.EventGrid => EventGrid}/topics/version.json | 0 .../namespaces/.bicep/nested_roleAssignments.bicep | 0 .../namespaces/.test/common/dependencies.bicep | 0 .../namespaces/.test/common/main.test.bicep | 0 .../namespaces/.test/min/main.test.bicep | 0 .../namespaces/.test/pe/dependencies.bicep | 0 .../namespaces/.test/pe/main.test.bicep | 0 .../namespaces/readme.md => EventHub/namespaces/README.md} | 0 .../namespaces/authorizationRules/README.md} | 0 .../namespaces/authorizationRules/main.bicep | 0 .../namespaces/authorizationRules/version.json | 0 .../namespaces/disasterRecoveryConfigs/README.md} | 0 .../namespaces/disasterRecoveryConfigs/main.bicep | 0 .../namespaces/disasterRecoveryConfigs/version.json | 0 .../namespaces/eventHubs/.bicep/nested_roleAssignments.bicep | 0 .../readme.md => EventHub/namespaces/eventHubs/README.md} | 0 .../namespaces/eventHubs/authorizationRules/README.md} | 0 .../namespaces/eventHubs/authorizationRules/main.bicep | 0 .../namespaces/eventHubs/authorizationRules/version.json | 0 .../namespaces/eventHubs/consumerGroups/README.md} | 0 .../namespaces/eventHubs/consumerGroups/main.bicep | 0 .../namespaces/eventHubs/consumerGroups/version.json | 0 .../namespaces/eventHubs/main.bicep | 0 .../namespaces/eventHubs/version.json | 0 modules/{Microsoft.EventHub => EventHub}/namespaces/main.bicep | 0 .../readme.md => EventHub/namespaces/networkRuleSets/README.md} | 0 .../namespaces/networkRuleSets/main.bicep | 0 .../namespaces/networkRuleSets/version.json | 0 modules/{Microsoft.EventHub => EventHub}/namespaces/version.json | 0 .../healthBots/.bicep/nested_roleAssignments.bicep | 0 .../healthBots/.test/common/dependencies.bicep | 0 .../healthBots/.test/common/main.test.bicep | 0 .../healthBots/.test/min/main.test.bicep | 0 .../healthBots/readme.md => HealthBot/healthBots/README.md} | 0 modules/{Microsoft.HealthBot => HealthBot}/healthBots/main.bicep | 0 .../{Microsoft.HealthBot => HealthBot}/healthBots/version.json | 0 .../workspaces/.bicep/nested_roleAssignments.bicep | 0 .../workspaces/.test/common/dependencies.bicep | 0 .../workspaces/.test/common/main.test.bicep | 0 .../workspaces/.test/min/main.test.bicep | 0 .../workspaces/readme.md => HealthcareApis/workspaces/README.md} | 0 .../workspaces/dicomservices/README.md} | 0 .../workspaces/dicomservices/main.bicep | 0 .../workspaces/dicomservices/version.json | 0 .../workspaces/fhirservices/.bicep/nested_roleAssignments.bicep | 0 .../workspaces/fhirservices/README.md} | 0 .../workspaces/fhirservices/main.bicep | 0 .../workspaces/fhirservices/version.json | 0 .../workspaces/iotconnectors/README.md} | 0 .../workspaces/iotconnectors/fhirdestinations/README.md} | 0 .../workspaces/iotconnectors/fhirdestinations/main.bicep | 0 .../workspaces/iotconnectors/fhirdestinations/version.json | 0 .../workspaces/iotconnectors/main.bicep | 0 .../workspaces/iotconnectors/version.json | 0 .../workspaces/main.bicep | 0 .../workspaces/version.json | 0 .../actionGroups/.bicep/nested_roleAssignments.bicep | 0 .../actionGroups/.test/common/dependencies.bicep | 0 .../actionGroups/.test/common/main.test.bicep | 0 .../actionGroups/.test/min/main.test.bicep | 0 .../actionGroups/readme.md => Insights/actionGroups/README.md} | 0 modules/{Microsoft.Insights => Insights}/actionGroups/main.bicep | 0 .../{Microsoft.Insights => Insights}/actionGroups/version.json | 0 .../activityLogAlerts/.bicep/nested_roleAssignments.bicep | 0 .../activityLogAlerts/.test/common/dependencies.bicep | 0 .../activityLogAlerts/.test/common/main.test.bicep | 0 .../readme.md => Insights/activityLogAlerts/README.md} | 0 .../{Microsoft.Insights => Insights}/activityLogAlerts/main.bicep | 0 .../activityLogAlerts/version.json | 0 .../components/.bicep/nested_roleAssignments.bicep | 0 .../components/.test/common/dependencies.bicep | 0 .../components/.test/common/main.test.bicep | 0 .../components/.test/min/dependencies.bicep | 0 .../components/.test/min/main.test.bicep | 0 .../components/readme.md => Insights/components/README.md} | 0 modules/{Microsoft.Insights => Insights}/components/main.bicep | 0 modules/{Microsoft.Insights => Insights}/components/version.json | 0 .../dataCollectionEndpoints/.bicep/nested_roleAssignments.bicep | 0 .../dataCollectionEndpoints/.test/common/dependencies.bicep | 0 .../dataCollectionEndpoints/.test/common/main.test.bicep | 0 .../dataCollectionEndpoints/.test/min/main.test.bicep | 0 .../readme.md => Insights/dataCollectionEndpoints/README.md} | 0 .../dataCollectionEndpoints/main.bicep | 0 .../dataCollectionEndpoints/version.json | 0 .../dataCollectionRules/.bicep/nested_roleAssignments.bicep | 0 .../dataCollectionRules/.test/customadv/dependencies.bicep | 0 .../dataCollectionRules/.test/customadv/main.test.bicep | 0 .../dataCollectionRules/.test/custombasic/dependencies.bicep | 0 .../dataCollectionRules/.test/custombasic/main.test.bicep | 0 .../dataCollectionRules/.test/customiis/dependencies.bicep | 0 .../dataCollectionRules/.test/customiis/main.test.bicep | 0 .../dataCollectionRules/.test/linux/dependencies.bicep | 0 .../dataCollectionRules/.test/linux/main.test.bicep | 0 .../dataCollectionRules/.test/min/main.test.bicep | 0 .../dataCollectionRules/.test/windows/dependencies.bicep | 0 .../dataCollectionRules/.test/windows/main.test.bicep | 0 .../readme.md => Insights/dataCollectionRules/README.md} | 0 .../dataCollectionRules/main.bicep | 0 .../dataCollectionRules/version.json | 0 .../diagnosticSettings/.test/common/main.test.bicep | 0 .../readme.md => Insights/diagnosticSettings/README.md} | 0 .../diagnosticSettings/main.bicep | 0 .../diagnosticSettings/version.json | 0 .../metricAlerts/.bicep/nested_roleAssignments.bicep | 0 .../metricAlerts/.test/common/dependencies.bicep | 0 .../metricAlerts/.test/common/main.test.bicep | 0 .../metricAlerts/readme.md => Insights/metricAlerts/README.md} | 0 modules/{Microsoft.Insights => Insights}/metricAlerts/main.bicep | 0 .../{Microsoft.Insights => Insights}/metricAlerts/version.json | 0 .../privateLinkScopes/.bicep/nested_roleAssignments.bicep | 0 .../privateLinkScopes/.test/common/dependencies.bicep | 0 .../privateLinkScopes/.test/common/main.test.bicep | 0 .../privateLinkScopes/.test/min/main.test.bicep | 0 .../readme.md => Insights/privateLinkScopes/README.md} | 0 .../{Microsoft.Insights => Insights}/privateLinkScopes/main.bicep | 0 .../privateLinkScopes/scopedResources/README.md} | 0 .../privateLinkScopes/scopedResources/main.bicep | 0 .../privateLinkScopes/scopedResources/version.json | 0 .../privateLinkScopes/version.json | 0 .../scheduledQueryRules/.bicep/nested_roleAssignments.bicep | 0 .../scheduledQueryRules/.test/common/dependencies.bicep | 0 .../scheduledQueryRules/.test/common/main.test.bicep | 0 .../readme.md => Insights/scheduledQueryRules/README.md} | 0 .../scheduledQueryRules/main.bicep | 0 .../scheduledQueryRules/version.json | 0 .../webTests/.bicep/nested_roleAssignments.bicep | 0 .../webTests/.test/common/dependencies.bicep | 0 .../webTests/.test/common/main.test.bicep | 0 .../webTests/.test/min/dependencies.bicep | 0 .../webTests/.test/min/main.test.bicep | 0 .../webTests/readme.md => Insights/webTests/README.md} | 0 modules/{Microsoft.Insights => Insights}/webTests/main.bicep | 0 modules/{Microsoft.Insights => Insights}/webTests/version.json | 0 .../vaults/.bicep/nested_roleAssignments.bicep | 0 .../vaults/.test/common/dependencies.bicep | 0 .../vaults/.test/common/main.test.bicep | 0 .../vaults/.test/min/main.test.bicep | 0 .../vaults/.test/pe/dependencies.bicep | 0 .../vaults/.test/pe/main.test.bicep | 0 .../vaults/readme.md => KeyVault/vaults/README.md} | 0 .../readme.md => KeyVault/vaults/accessPolicies/README.md} | 0 .../vaults/accessPolicies/main.bicep | 0 .../vaults/accessPolicies/version.json | 0 .../vaults/keys/.bicep/nested_roleAssignments.bicep | 0 .../vaults/keys/readme.md => KeyVault/vaults/keys/README.md} | 0 modules/{Microsoft.KeyVault => KeyVault}/vaults/keys/main.bicep | 0 modules/{Microsoft.KeyVault => KeyVault}/vaults/keys/version.json | 0 modules/{Microsoft.KeyVault => KeyVault}/vaults/main.bicep | 0 .../vaults/secrets/.bicep/nested_roleAssignments.bicep | 0 .../secrets/readme.md => KeyVault/vaults/secrets/README.md} | 0 .../{Microsoft.KeyVault => KeyVault}/vaults/secrets/main.bicep | 0 .../{Microsoft.KeyVault => KeyVault}/vaults/secrets/version.json | 0 modules/{Microsoft.KeyVault => KeyVault}/vaults/version.json | 0 .../extensions/.test/common/dependencies.bicep | 0 .../extensions/.test/common/main.test.bicep | 0 .../extensions/.test/min/dependencies.bicep | 0 .../extensions/.test/min/main.test.bicep | 0 .../readme.md => KubernetesConfiguration/extensions/README.md} | 0 .../extensions/main.bicep | 0 .../extensions/version.json | 0 .../fluxConfigurations/.test/common/dependencies.bicep | 0 .../fluxConfigurations/.test/common/main.test.bicep | 0 .../fluxConfigurations/.test/min/dependencies.bicep | 0 .../fluxConfigurations/.test/min/main.test.bicep | 0 .../fluxConfigurations/README.md} | 0 .../fluxConfigurations/main.bicep | 0 .../fluxConfigurations/version.json | 0 .../workflows/.bicep/nested_roleAssignments.bicep | 0 .../workflows/.test/common/dependencies.bicep | 0 .../workflows/.test/common/main.test.bicep | 0 .../workflows/readme.md => Logic/workflows/README.md} | 0 modules/{Microsoft.Logic => Logic}/workflows/main.bicep | 0 modules/{Microsoft.Logic => Logic}/workflows/version.json | 0 .../workspaces/.bicep/nested_roleAssignments.bicep | 0 .../workspaces/.test/common/dependencies.bicep | 0 .../workspaces/.test/common/main.test.bicep | 0 .../workspaces/.test/encr/dependencies.bicep | 0 .../workspaces/.test/encr/main.test.bicep | 0 .../workspaces/.test/min/dependencies.bicep | 0 .../workspaces/.test/min/main.test.bicep | 0 .../readme.md => MachineLearningServices/workspaces/README.md} | 0 .../workspaces/computes/README.md} | 0 .../workspaces/computes/main.bicep | 0 .../workspaces/computes/version.json | 0 .../workspaces/main.bicep | 0 .../workspaces/version.json | 0 .../maintenanceConfigurations/.bicep/nested_roleAssignments.bicep | 0 .../maintenanceConfigurations/.test/common/dependencies.bicep | 0 .../maintenanceConfigurations/.test/common/main.test.bicep | 0 .../maintenanceConfigurations/.test/min/main.test.bicep | 0 .../readme.md => Maintenance/maintenanceConfigurations/README.md} | 0 .../maintenanceConfigurations/main.bicep | 0 .../maintenanceConfigurations/version.json | 0 .../userAssignedIdentities/.bicep/nested_roleAssignments.bicep | 0 .../userAssignedIdentities/.test/common/dependencies.bicep | 0 .../userAssignedIdentities/.test/common/main.test.bicep | 0 .../userAssignedIdentities/README.md} | 0 .../userAssignedIdentities/main.bicep | 0 .../userAssignedIdentities/version.json | 0 .../.bicep/nested_registrationAssignment.bicep | 0 .../registrationDefinitions/.test/common/main.test.bicep | 0 .../registrationDefinitions/.test/rg/main.test.bicep | 0 .../registrationDefinitions/README.md} | 0 .../registrationDefinitions/main.bicep | 0 .../registrationDefinitions/version.json | 0 .../managementGroups/.test/common/main.test.bicep | 0 .../managementGroups/.test/min/main.test.bicep | 0 .../readme.md => Management/managementGroups/README.md} | 0 .../managementGroups/main.bicep | 0 .../managementGroups/version.json | 0 .../netAppAccounts/.bicep/nested_roleAssignments.bicep | 0 .../netAppAccounts/.test/min/main.test.bicep | 0 .../netAppAccounts/.test/nfs3/dependencies.bicep | 0 .../netAppAccounts/.test/nfs3/main.test.bicep | 0 .../netAppAccounts/.test/nfs41/dependencies.bicep | 0 .../netAppAccounts/.test/nfs41/main.test.bicep | 0 .../netAppAccounts/readme.md => NetApp/netAppAccounts/README.md} | 0 .../capacityPools/.bicep/nested_roleAssignments.bicep | 0 .../readme.md => NetApp/netAppAccounts/capacityPools/README.md} | 0 .../netAppAccounts/capacityPools/main.bicep | 0 .../netAppAccounts/capacityPools/version.json | 0 .../capacityPools/volumes/.bicep/nested_roleAssignments.bicep | 0 .../netAppAccounts/capacityPools/volumes/README.md} | 0 .../netAppAccounts/capacityPools/volumes/main.bicep | 0 .../netAppAccounts/capacityPools/volumes/version.json | 0 modules/{Microsoft.NetApp => NetApp}/netAppAccounts/main.bicep | 0 modules/{Microsoft.NetApp => NetApp}/netAppAccounts/version.json | 0 .../workspaces/.bicep/nested_roleAssignments.bicep | 0 .../workspaces/.test/adv/dependencies.bicep | 0 .../workspaces/.test/adv/main.test.bicep | 0 .../workspaces/.test/common/dependencies.bicep | 0 .../workspaces/.test/common/main.test.bicep | 0 .../workspaces/.test/min/main.test.bicep | 0 .../readme.md => OperationalInsights/workspaces/README.md} | 0 .../workspaces/dataExports/README.md} | 0 .../workspaces/dataExports/main.bicep | 0 .../workspaces/dataExports/version.json | 0 .../workspaces/dataSources/README.md} | 0 .../workspaces/dataSources/main.bicep | 0 .../workspaces/dataSources/version.json | 0 .../workspaces/linkedServices/README.md} | 0 .../workspaces/linkedServices/main.bicep | 0 .../workspaces/linkedServices/version.json | 0 .../workspaces/linkedStorageAccounts/README.md} | 0 .../workspaces/linkedStorageAccounts/main.bicep | 0 .../workspaces/linkedStorageAccounts/version.json | 0 .../workspaces/main.bicep | 0 .../workspaces/savedSearches/README.md} | 0 .../workspaces/savedSearches/main.bicep | 0 .../workspaces/savedSearches/version.json | 0 .../workspaces/storageInsightConfigs/README.md} | 0 .../workspaces/storageInsightConfigs/main.bicep | 0 .../workspaces/storageInsightConfigs/version.json | 0 .../readme.md => OperationalInsights/workspaces/tables/README.md} | 0 .../workspaces/tables/main.bicep | 0 .../workspaces/tables/version.json | 0 .../workspaces/version.json | 0 .../solutions/.test/min/dependencies.bicep | 0 .../solutions/.test/min/main.test.bicep | 0 .../solutions/.test/ms/dependencies.bicep | 0 .../solutions/.test/ms/main.test.bicep | 0 .../solutions/.test/nonms/dependencies.bicep | 0 .../solutions/.test/nonms/main.test.bicep | 0 .../readme.md => OperationsManagement/solutions/README.md} | 0 .../solutions/main.bicep | 0 .../solutions/version.json | 0 .../remediations/.test/mg.common/main.test.bicep | 0 .../remediations/.test/mg.min/main.test.bicep | 0 .../remediations/.test/rg.common/main.test.bicep | 0 .../remediations/.test/rg.min/main.test.bicep | 0 .../remediations/.test/sub.common/main.test.bicep | 0 .../remediations/.test/sub.min/main.test.bicep | 0 .../readme.md => PolicyInsights/remediations/README.md} | 0 .../remediations/main.bicep | 0 .../remediations/managementGroup/README.md} | 0 .../remediations/managementGroup/main.bicep | 0 .../remediations/managementGroup/version.json | 0 .../remediations/resourceGroup/README.md} | 0 .../remediations/resourceGroup/main.bicep | 0 .../remediations/resourceGroup/version.json | 0 .../remediations/subscription/README.md} | 0 .../remediations/subscription/main.bicep | 0 .../remediations/subscription/version.json | 0 .../remediations/version.json | 0 .../capacities/.bicep/nested_roleAssignments.bicep | 0 .../capacities/.test/common/dependencies.bicep | 0 .../capacities/.test/common/main.test.bicep | 0 .../capacities/.test/min/dependencies.bicep | 0 .../capacities/.test/min/main.test.bicep | 0 .../readme.md => PowerBIDedicated/capacities/README.md} | 0 .../capacities/main.bicep | 0 .../capacities/version.json | 0 .../accounts/.bicep/nested_roleAssignments.bicep | 0 .../accounts/.test/common/dependencies.bicep | 0 .../accounts/.test/common/main.test.bicep | 0 .../accounts/.test/min/main.test.bicep | 0 .../accounts/readme.md => Purview/accounts/README.md} | 0 modules/{Microsoft.Purview => Purview}/accounts/main.bicep | 0 modules/{Microsoft.Purview => Purview}/accounts/version.json | 0 .../vaults/.bicep/nested_roleAssignments.bicep | 0 .../vaults/.test/common/dependencies.bicep | 0 .../vaults/.test/common/main.test.bicep | 0 .../vaults/.test/dr/main.test.bicep | 0 .../vaults/.test/min/main.test.bicep | 0 .../vaults/readme.md => RecoveryServices/vaults/README.md} | 0 .../readme.md => RecoveryServices/vaults/backupConfig/README.md} | 0 .../vaults/backupConfig/main.bicep | 0 .../vaults/backupConfig/version.json | 0 .../vaults/backupPolicies/README.md} | 0 .../vaults/backupPolicies/main.bicep | 0 .../vaults/backupPolicies/version.json | 0 .../vaults/backupStorageConfig/README.md} | 0 .../vaults/backupStorageConfig/main.bicep | 0 .../vaults/backupStorageConfig/version.json | 0 .../vaults/main.bicep | 0 .../vaults/protectionContainers/README.md} | 0 .../vaults/protectionContainers/main.bicep | 0 .../vaults/protectionContainers/protectedItems/README.md} | 0 .../vaults/protectionContainers/protectedItems/main.bicep | 0 .../vaults/protectionContainers/protectedItems/version.json | 0 .../vaults/protectionContainers/version.json | 0 .../vaults/replicationAlertSettings/README.md} | 0 .../vaults/replicationAlertSettings/main.bicep | 0 .../vaults/replicationAlertSettings/version.json | 0 .../vaults/replicationFabrics/README.md} | 0 .../vaults/replicationFabrics/main.bicep | 0 .../replicationFabrics/replicationProtectionContainers/README.md} | 0 .../replicationFabrics/replicationProtectionContainers/main.bicep | 0 .../replicationProtectionContainerMappings/README.md} | 0 .../replicationProtectionContainerMappings/main.bicep | 0 .../replicationProtectionContainerMappings/version.json | 0 .../replicationProtectionContainers/version.json | 0 .../vaults/replicationFabrics/version.json | 0 .../vaults/replicationPolicies/README.md} | 0 .../vaults/replicationPolicies/main.bicep | 0 .../vaults/replicationPolicies/version.json | 0 .../vaults/version.json | 0 .../deploymentScripts/.test/cli/dependencies.bicep | 0 .../deploymentScripts/.test/cli/main.test.bicep | 0 .../deploymentScripts/.test/ps/dependencies.bicep | 0 .../deploymentScripts/.test/ps/main.test.bicep | 0 .../readme.md => Resources/deploymentScripts/README.md} | 0 .../deploymentScripts/main.bicep | 0 .../deploymentScripts/version.json | 0 .../resourceGroups/.bicep/nested_roleAssignments.bicep | 0 .../resourceGroups/.test/common/dependencies.bicep | 0 .../resourceGroups/.test/common/main.test.bicep | 0 .../resourceGroups/.test/min/main.test.bicep | 0 .../readme.md => Resources/resourceGroups/README.md} | 0 .../{Microsoft.Resources => Resources}/resourceGroups/main.bicep | 0 .../resourceGroups/version.json | 0 .../tags/.test/min/main.test.bicep | 0 .../tags/.test/rg/main.test.bicep | 0 .../tags/.test/sub/main.test.bicep | 0 .../tags/readme.md => Resources/tags/README.md} | 0 modules/{Microsoft.Resources => Resources}/tags/main.bicep | 0 .../tags/resourceGroups/.bicep/readTags.bicep | 0 .../readme.md => Resources/tags/resourceGroups/README.md} | 0 .../tags/resourceGroups/main.bicep | 0 .../tags/resourceGroups/version.json | 0 .../tags/subscriptions/.bicep/readTags.bicep | 0 .../readme.md => Resources/tags/subscriptions/README.md} | 0 .../tags/subscriptions/main.bicep | 0 .../tags/subscriptions/version.json | 0 modules/{Microsoft.Resources => Resources}/tags/version.json | 0 .../azureSecurityCenter/.bicep/nested_iotSecuritySolutions.bicep | 0 .../azureSecurityCenter/.test/common/dependencies.bicep | 0 .../azureSecurityCenter/.test/common/main.test.bicep | 0 .../readme.md => Security/azureSecurityCenter/README.md} | 0 .../azureSecurityCenter/main.bicep | 0 .../azureSecurityCenter/version.json | 0 .../namespaces/.bicep/nested_roleAssignments.bicep | 0 .../namespaces/.test/common/dependencies.bicep | 0 .../namespaces/.test/common/main.test.bicep | 0 .../namespaces/.test/encr/dependencies.bicep | 0 .../namespaces/.test/encr/main.test.bicep | 0 .../namespaces/.test/min/main.test.bicep | 0 .../namespaces/.test/pe/dependencies.bicep | 0 .../namespaces/.test/pe/main.test.bicep | 0 .../namespaces/readme.md => ServiceBus/namespaces/README.md} | 0 .../namespaces/authorizationRules/README.md} | 0 .../namespaces/authorizationRules/main.bicep | 0 .../namespaces/authorizationRules/version.json | 0 .../namespaces/disasterRecoveryConfigs/README.md} | 0 .../namespaces/disasterRecoveryConfigs/main.bicep | 0 .../namespaces/disasterRecoveryConfigs/version.json | 0 .../{Microsoft.ServiceBus => ServiceBus}/namespaces/main.bicep | 0 .../namespaces/migrationConfigurations/README.md} | 0 .../namespaces/migrationConfigurations/main.bicep | 0 .../namespaces/migrationConfigurations/version.json | 0 .../readme.md => ServiceBus/namespaces/networkRuleSets/README.md} | 0 .../namespaces/networkRuleSets/main.bicep | 0 .../namespaces/networkRuleSets/version.json | 0 .../namespaces/queues/.bicep/nested_roleAssignments.bicep | 0 .../queues/readme.md => ServiceBus/namespaces/queues/README.md} | 0 .../namespaces/queues/authorizationRules/README.md} | 0 .../namespaces/queues/authorizationRules/main.bicep | 0 .../namespaces/queues/authorizationRules/version.json | 0 .../namespaces/queues/main.bicep | 0 .../namespaces/queues/version.json | 0 .../namespaces/topics/.bicep/nested_roleAssignments.bicep | 0 .../topics/readme.md => ServiceBus/namespaces/topics/README.md} | 0 .../namespaces/topics/authorizationRules/README.md} | 0 .../namespaces/topics/authorizationRules/main.bicep | 0 .../namespaces/topics/authorizationRules/version.json | 0 .../namespaces/topics/main.bicep | 0 .../namespaces/topics/version.json | 0 .../{Microsoft.ServiceBus => ServiceBus}/namespaces/version.json | 0 .../clusters/.bicep/nested_roleAssignments.bicep | 0 .../clusters/.test/cert/main.test.bicep | 0 .../clusters/.test/common/dependencies.bicep | 0 .../clusters/.test/common/main.test.bicep | 0 .../clusters/.test/min/main.test.bicep | 0 .../clusters/readme.md => ServiceFabric/clusters/README.md} | 0 .../clusters/applicationTypes/README.md} | 0 .../clusters/applicationTypes/main.bicep | 0 .../clusters/applicationTypes/version.json | 0 .../clusters/main.bicep | 0 .../clusters/version.json | 0 .../signalR/.bicep/nested_roleAssignments.bicep | 0 .../signalR/.test/common/dependencies.bicep | 0 .../signalR/.test/common/main.test.bicep | 0 .../signalR/.test/min/main.test.bicep | 0 .../signalR/readme.md => SignalRService/signalR/README.md} | 0 .../signalR/main.bicep | 0 .../signalR/version.json | 0 .../webPubSub/.bicep/nested_roleAssignments.bicep | 0 .../webPubSub/.test/common/dependencies.bicep | 0 .../webPubSub/.test/common/main.test.bicep | 0 .../webPubSub/.test/min/main.test.bicep | 0 .../webPubSub/.test/pe/dependencies.bicep | 0 .../webPubSub/.test/pe/main.test.bicep | 0 .../webPubSub/readme.md => SignalRService/webPubSub/README.md} | 0 .../webPubSub/main.bicep | 0 .../webPubSub/version.json | 0 .../managedInstances/.bicep/nested_roleAssignments.bicep | 0 .../managedInstances/.test/common/dependencies.bicep | 0 .../managedInstances/.test/common/main.test.bicep | 0 .../managedInstances/.test/min/dependencies.bicep | 0 .../managedInstances/.test/min/main.test.bicep | 0 .../managedInstances/readme.md => Sql/managedInstances/README.md} | 0 .../readme.md => Sql/managedInstances/administrators/README.md} | 0 .../managedInstances/administrators/main.bicep | 0 .../managedInstances/administrators/version.json | 0 .../readme.md => Sql/managedInstances/databases/README.md} | 0 .../databases/backupLongTermRetentionPolicies/README.md} | 0 .../databases/backupLongTermRetentionPolicies/main.bicep | 0 .../databases/backupLongTermRetentionPolicies/version.json | 0 .../databases/backupShortTermRetentionPolicies/README.md} | 0 .../databases/backupShortTermRetentionPolicies/main.bicep | 0 .../databases/backupShortTermRetentionPolicies/version.json | 0 .../{Microsoft.Sql => Sql}/managedInstances/databases/main.bicep | 0 .../managedInstances/databases/version.json | 0 .../managedInstances/encryptionProtector/README.md} | 0 .../managedInstances/encryptionProtector/main.bicep | 0 .../managedInstances/encryptionProtector/version.json | 0 .../keys/readme.md => Sql/managedInstances/keys/README.md} | 0 modules/{Microsoft.Sql => Sql}/managedInstances/keys/main.bicep | 0 modules/{Microsoft.Sql => Sql}/managedInstances/keys/version.json | 0 modules/{Microsoft.Sql => Sql}/managedInstances/main.bicep | 0 .../managedInstances/securityAlertPolicies/README.md} | 0 .../managedInstances/securityAlertPolicies/main.bicep | 0 .../managedInstances/securityAlertPolicies/version.json | 0 modules/{Microsoft.Sql => Sql}/managedInstances/version.json | 0 .../managedInstances/vulnerabilityAssessments/README.md} | 0 .../managedInstances/vulnerabilityAssessments/main.bicep | 0 .../managedInstances/vulnerabilityAssessments/version.json | 0 .../servers/.bicep/nested_roleAssignments.bicep | 0 .../{Microsoft.Sql => Sql}/servers/.test/admin/dependencies.bicep | 0 .../{Microsoft.Sql => Sql}/servers/.test/admin/main.test.bicep | 0 .../servers/.test/common/dependencies.bicep | 0 .../{Microsoft.Sql => Sql}/servers/.test/common/main.test.bicep | 0 .../{Microsoft.Sql => Sql}/servers/.test/pe/dependencies.bicep | 0 modules/{Microsoft.Sql => Sql}/servers/.test/pe/main.test.bicep | 0 .../servers/.test/secondary/dependencies.bicep | 0 .../servers/.test/secondary/main.test.bicep | 0 .../{Microsoft.Sql/servers/readme.md => Sql/servers/README.md} | 0 .../databases/readme.md => Sql/servers/databases/README.md} | 0 .../servers/databases/backupLongTermRetentionPolicies/README.md} | 0 .../servers/databases/backupLongTermRetentionPolicies/main.bicep | 0 .../databases/backupLongTermRetentionPolicies/version.json | 0 .../servers/databases/backupShortTermRetentionPolicies/README.md} | 0 .../servers/databases/backupShortTermRetentionPolicies/main.bicep | 0 .../databases/backupShortTermRetentionPolicies/version.json | 0 modules/{Microsoft.Sql => Sql}/servers/databases/main.bicep | 0 modules/{Microsoft.Sql => Sql}/servers/databases/version.json | 0 .../elasticPools/readme.md => Sql/servers/elasticPools/README.md} | 0 modules/{Microsoft.Sql => Sql}/servers/elasticPools/main.bicep | 0 modules/{Microsoft.Sql => Sql}/servers/elasticPools/version.json | 0 .../readme.md => Sql/servers/encryptionProtector/README.md} | 0 .../{Microsoft.Sql => Sql}/servers/encryptionProtector/main.bicep | 0 .../servers/encryptionProtector/version.json | 0 .../readme.md => Sql/servers/firewallRules/README.md} | 0 modules/{Microsoft.Sql => Sql}/servers/firewallRules/main.bicep | 0 modules/{Microsoft.Sql => Sql}/servers/firewallRules/version.json | 0 .../servers/keys/readme.md => Sql/servers/keys/README.md} | 0 modules/{Microsoft.Sql => Sql}/servers/keys/main.bicep | 0 modules/{Microsoft.Sql => Sql}/servers/keys/version.json | 0 modules/{Microsoft.Sql => Sql}/servers/main.bicep | 0 .../readme.md => Sql/servers/securityAlertPolicies/README.md} | 0 .../servers/securityAlertPolicies/main.bicep | 0 .../servers/securityAlertPolicies/version.json | 0 modules/{Microsoft.Sql => Sql}/servers/version.json | 0 .../readme.md => Sql/servers/virtualNetworkRules/README.md} | 0 .../{Microsoft.Sql => Sql}/servers/virtualNetworkRules/main.bicep | 0 .../servers/virtualNetworkRules/version.json | 0 .../readme.md => Sql/servers/vulnerabilityAssessments/README.md} | 0 .../servers/vulnerabilityAssessments/main.bicep | 0 .../servers/vulnerabilityAssessments/version.json | 0 .../privateLinkHubs/.bicep/nested_roleAssignments.bicep | 0 .../privateLinkHubs/.test/common/dependencies.bicep | 0 .../privateLinkHubs/.test/common/main.test.bicep | 0 .../privateLinkHubs/.test/min/main.test.bicep | 0 .../readme.md => Synapse/privateLinkHubs/README.md} | 0 modules/{Microsoft.Synapse => Synapse}/privateLinkHubs/main.bicep | 0 .../{Microsoft.Synapse => Synapse}/privateLinkHubs/version.json | 0 .../workspaces/.bicep/nested_cmkRbac.bicep | 0 .../workspaces/.bicep/nested_roleAssignments.bicep | 0 .../workspaces/.test/common/dependencies.bicep | 0 .../workspaces/.test/common/main.test.bicep | 0 .../workspaces/.test/encrwsai/dependencies.bicep | 0 .../workspaces/.test/encrwsai/main.test.bicep | 0 .../workspaces/.test/encrwuai/dependencies.bicep | 0 .../workspaces/.test/encrwuai/main.test.bicep | 0 .../workspaces/.test/managedvnet/dependencies.bicep | 0 .../workspaces/.test/managedvnet/main.test.bicep | 0 .../workspaces/.test/min/dependencies.bicep | 0 .../workspaces/.test/min/main.test.bicep | 0 .../workspaces/readme.md => Synapse/workspaces/README.md} | 0 .../keys/readme.md => Synapse/workspaces/keys/README.md} | 0 modules/{Microsoft.Synapse => Synapse}/workspaces/keys/main.bicep | 0 .../{Microsoft.Synapse => Synapse}/workspaces/keys/version.json | 0 modules/{Microsoft.Synapse => Synapse}/workspaces/main.bicep | 0 modules/{Microsoft.Synapse => Synapse}/workspaces/version.json | 0 .../imageTemplates/.bicep/nested_roleAssignments.bicep | 0 .../imageTemplates/.test/common/dependencies.bicep | 0 .../imageTemplates/.test/common/main.test.bicep | 0 .../imageTemplates/.test/min/dependencies.bicep | 0 .../imageTemplates/.test/min/main.test.bicep | 0 .../readme.md => VirtualMachineImages/imageTemplates/README.md} | 0 .../imageTemplates/main.bicep | 0 .../imageTemplates/version.json | 0 .../connections/.bicep/nested_roleAssignments.bicep | 0 .../connections/.test/common/dependencies.bicep | 0 .../connections/.test/common/main.test.bicep | 0 .../connections/readme.md => Web/connections/README.md} | 0 modules/{Microsoft.Web => Web}/connections/main.bicep | 0 modules/{Microsoft.Web => Web}/connections/version.json | 0 .../hostingEnvironments/.bicep/nested_roleAssignments.bicep | 0 .../hostingEnvironments/.test/asev2/dependencies.bicep | 0 .../hostingEnvironments/.test/asev2/main.test.bicep | 0 .../hostingEnvironments/.test/asev3/dependencies.bicep | 0 .../hostingEnvironments/.test/asev3/main.test.bicep | 0 .../readme.md => Web/hostingEnvironments/README.md} | 0 .../hostingEnvironments/configurations-customdnssuffix/README.md} | 0 .../hostingEnvironments/configurations-customdnssuffix/main.bicep | 0 .../configurations-customdnssuffix/version.json | 0 .../hostingEnvironments/configurations-networking/README.md} | 0 .../hostingEnvironments/configurations-networking/main.bicep | 0 .../hostingEnvironments/configurations-networking/version.json | 0 modules/{Microsoft.Web => Web}/hostingEnvironments/main.bicep | 0 modules/{Microsoft.Web => Web}/hostingEnvironments/version.json | 0 .../serverfarms/.bicep/nested_roleAssignments.bicep | 0 .../serverfarms/.test/common/dependencies.bicep | 0 .../serverfarms/.test/common/main.test.bicep | 0 .../serverfarms/readme.md => Web/serverfarms/README.md} | 0 modules/{Microsoft.Web => Web}/serverfarms/main.bicep | 0 modules/{Microsoft.Web => Web}/serverfarms/version.json | 0 .../sites/.bicep/nested_roleAssignments.bicep | 0 .../sites/.test/functionAppCommon/dependencies.bicep | 0 .../sites/.test/functionAppCommon/main.test.bicep | 0 .../sites/.test/functionAppMin/dependencies.bicep | 0 .../sites/.test/functionAppMin/main.test.bicep | 0 .../sites/.test/webAppCommon/dependencies.bicep | 0 .../sites/.test/webAppCommon/main.test.bicep | 0 .../sites/.test/webAppMin/dependencies.bicep | 0 .../{Microsoft.Web => Web}/sites/.test/webAppMin/main.test.bicep | 0 modules/{Microsoft.Web/sites/readme.md => Web/sites/README.md} | 0 .../sites/basicPublishingCredentialsPolicies/README.md} | 0 .../sites/basicPublishingCredentialsPolicies/main.bicep | 0 .../sites/basicPublishingCredentialsPolicies/version.json | 0 .../readme.md => Web/sites/config-appsettings/README.md} | 0 .../{Microsoft.Web => Web}/sites/config-appsettings/main.bicep | 0 .../{Microsoft.Web => Web}/sites/config-appsettings/version.json | 0 .../readme.md => Web/sites/config-authsettingsv2/README.md} | 0 .../{Microsoft.Web => Web}/sites/config-authsettingsv2/main.bicep | 0 .../sites/config-authsettingsv2/version.json | 0 modules/{Microsoft.Web => Web}/sites/main.bicep | 0 .../sites/slots/.bicep/nested_roleAssignments.bicep | 0 .../sites/slots/readme.md => Web/sites/slots/README.md} | 0 .../readme.md => Web/sites/slots/config-appsettings/README.md} | 0 .../sites/slots/config-appsettings/main.bicep | 0 .../sites/slots/config-appsettings/version.json | 0 .../readme.md => Web/sites/slots/config-authsettingsv2/README.md} | 0 .../sites/slots/config-authsettingsv2/main.bicep | 0 .../sites/slots/config-authsettingsv2/version.json | 0 modules/{Microsoft.Web => Web}/sites/slots/main.bicep | 0 modules/{Microsoft.Web => Web}/sites/slots/version.json | 0 modules/{Microsoft.Web => Web}/sites/version.json | 0 .../staticSites/.bicep/nested_roleAssignments.bicep | 0 .../staticSites/.test/common/dependencies.bicep | 0 .../staticSites/.test/common/main.test.bicep | 0 .../{Microsoft.Web => Web}/staticSites/.test/min/main.test.bicep | 0 .../staticSites/readme.md => Web/staticSites/README.md} | 0 .../config/readme.md => Web/staticSites/config/README.md} | 0 modules/{Microsoft.Web => Web}/staticSites/config/main.bicep | 0 modules/{Microsoft.Web => Web}/staticSites/config/version.json | 0 .../readme.md => Web/staticSites/customDomains/README.md} | 0 .../{Microsoft.Web => Web}/staticSites/customDomains/main.bicep | 0 .../{Microsoft.Web => Web}/staticSites/customDomains/version.json | 0 .../readme.md => Web/staticSites/linkedBackends/README.md} | 0 .../{Microsoft.Web => Web}/staticSites/linkedBackends/main.bicep | 0 .../staticSites/linkedBackends/version.json | 0 modules/{Microsoft.Web => Web}/staticSites/main.bicep | 0 modules/{Microsoft.Web => Web}/staticSites/version.json | 0 1094 files changed, 0 insertions(+), 0 deletions(-) rename modules/{Microsoft.AAD => AAD}/DomainServices/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.AAD => AAD}/DomainServices/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.AAD => AAD}/DomainServices/.test/common/main.test.bicep (100%) rename modules/{Microsoft.AAD/DomainServices/readme.md => AAD/DomainServices/README.md} (100%) rename modules/{Microsoft.AAD => AAD}/DomainServices/main.bicep (100%) rename modules/{Microsoft.AAD => AAD}/DomainServices/version.json (100%) rename modules/{Microsoft.AnalysisServices => AnalysisServices}/servers/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.AnalysisServices => AnalysisServices}/servers/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.AnalysisServices => AnalysisServices}/servers/.test/common/main.test.bicep (100%) rename modules/{Microsoft.AnalysisServices => AnalysisServices}/servers/.test/max/dependencies.bicep (100%) rename modules/{Microsoft.AnalysisServices => AnalysisServices}/servers/.test/max/main.test.bicep (100%) rename modules/{Microsoft.AnalysisServices => AnalysisServices}/servers/.test/min/main.test.bicep (100%) rename modules/{Microsoft.AnalysisServices/servers/readme.md => AnalysisServices/servers/README.md} (100%) rename modules/{Microsoft.AnalysisServices => AnalysisServices}/servers/main.bicep (100%) rename modules/{Microsoft.AnalysisServices => AnalysisServices}/servers/version.json (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/.test/common/main.test.bicep (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/.test/max/dependencies.bicep (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/.test/max/main.test.bicep (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/.test/min/main.test.bicep (100%) rename modules/{Microsoft.ApiManagement/service/readme.md => ApiManagement/service/README.md} (100%) rename modules/{Microsoft.ApiManagement/service/apiVersionSets/readme.md => ApiManagement/service/apiVersionSets/README.md} (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/apiVersionSets/main.bicep (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/apiVersionSets/version.json (100%) rename modules/{Microsoft.ApiManagement/service/apis/readme.md => ApiManagement/service/apis/README.md} (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/apis/main.bicep (100%) rename modules/{Microsoft.ApiManagement/service/apis/policies/readme.md => ApiManagement/service/apis/policies/README.md} (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/apis/policies/main.bicep (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/apis/policies/version.json (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/apis/version.json (100%) rename modules/{Microsoft.ApiManagement/service/authorizationServers/readme.md => ApiManagement/service/authorizationServers/README.md} (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/authorizationServers/main.bicep (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/authorizationServers/version.json (100%) rename modules/{Microsoft.ApiManagement/service/backends/readme.md => ApiManagement/service/backends/README.md} (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/backends/main.bicep (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/backends/version.json (100%) rename modules/{Microsoft.ApiManagement/service/caches/readme.md => ApiManagement/service/caches/README.md} (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/caches/main.bicep (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/caches/version.json (100%) rename modules/{Microsoft.ApiManagement/service/identityProviders/readme.md => ApiManagement/service/identityProviders/README.md} (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/identityProviders/main.bicep (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/identityProviders/version.json (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/main.bicep (100%) rename modules/{Microsoft.ApiManagement/service/namedValues/readme.md => ApiManagement/service/namedValues/README.md} (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/namedValues/main.bicep (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/namedValues/version.json (100%) rename modules/{Microsoft.ApiManagement/service/policies/readme.md => ApiManagement/service/policies/README.md} (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/policies/main.bicep (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/policies/version.json (100%) rename modules/{Microsoft.ApiManagement/service/portalSettings/readme.md => ApiManagement/service/portalSettings/README.md} (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/portalSettings/main.bicep (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/portalSettings/version.json (100%) rename modules/{Microsoft.ApiManagement/service/products/readme.md => ApiManagement/service/products/README.md} (100%) rename modules/{Microsoft.ApiManagement/service/products/apis/readme.md => ApiManagement/service/products/apis/README.md} (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/products/apis/main.bicep (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/products/apis/version.json (100%) rename modules/{Microsoft.ApiManagement/service/products/groups/readme.md => ApiManagement/service/products/groups/README.md} (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/products/groups/main.bicep (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/products/groups/version.json (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/products/main.bicep (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/products/version.json (100%) rename modules/{Microsoft.ApiManagement/service/subscriptions/readme.md => ApiManagement/service/subscriptions/README.md} (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/subscriptions/main.bicep (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/subscriptions/version.json (100%) rename modules/{Microsoft.ApiManagement => ApiManagement}/service/version.json (100%) rename modules/{Microsoft.App => App}/containerApps/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.App => App}/containerApps/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.App => App}/containerApps/.test/common/main.test.bicep (100%) rename modules/{Microsoft.App => App}/containerApps/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.App => App}/containerApps/.test/min/main.test.bicep (100%) rename modules/{Microsoft.App/containerApps/readme.md => App/containerApps/README.md} (100%) rename modules/{Microsoft.App => App}/containerApps/main.bicep (100%) rename modules/{Microsoft.App => App}/containerApps/version.json (100%) rename modules/{Microsoft.App => App}/managedEnvironments/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.App => App}/managedEnvironments/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.App => App}/managedEnvironments/.test/common/main.test.bicep (100%) rename modules/{Microsoft.App => App}/managedEnvironments/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.App => App}/managedEnvironments/.test/min/main.test.bicep (100%) rename modules/{Microsoft.App/managedEnvironments/readme.md => App/managedEnvironments/README.md} (100%) rename modules/{Microsoft.App => App}/managedEnvironments/main.bicep (100%) rename modules/{Microsoft.App => App}/managedEnvironments/version.json (100%) rename modules/{Microsoft.AppConfiguration => AppConfiguration}/configurationStores/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.AppConfiguration => AppConfiguration}/configurationStores/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.AppConfiguration => AppConfiguration}/configurationStores/.test/common/main.test.bicep (100%) rename modules/{Microsoft.AppConfiguration => AppConfiguration}/configurationStores/.test/min/main.test.bicep (100%) rename modules/{Microsoft.AppConfiguration => AppConfiguration}/configurationStores/.test/pe/dependencies.bicep (100%) rename modules/{Microsoft.AppConfiguration => AppConfiguration}/configurationStores/.test/pe/main.test.bicep (100%) rename modules/{Microsoft.AppConfiguration/configurationStores/readme.md => AppConfiguration/configurationStores/README.md} (100%) rename modules/{Microsoft.AppConfiguration => AppConfiguration}/configurationStores/keyValues/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.AppConfiguration/configurationStores/keyValues/readme.md => AppConfiguration/configurationStores/keyValues/README.md} (100%) rename modules/{Microsoft.AppConfiguration => AppConfiguration}/configurationStores/keyValues/main.bicep (100%) rename modules/{Microsoft.AppConfiguration => AppConfiguration}/configurationStores/keyValues/version.json (100%) rename modules/{Microsoft.AppConfiguration => AppConfiguration}/configurationStores/main.bicep (100%) rename modules/{Microsoft.AppConfiguration => AppConfiguration}/configurationStores/version.json (100%) rename modules/{Microsoft.Automation => Automation}/automationAccounts/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Automation => Automation}/automationAccounts/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Automation => Automation}/automationAccounts/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Automation => Automation}/automationAccounts/.test/encr/dependencies.bicep (100%) rename modules/{Microsoft.Automation => Automation}/automationAccounts/.test/encr/main.test.bicep (100%) rename modules/{Microsoft.Automation => Automation}/automationAccounts/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Automation/automationAccounts/readme.md => Automation/automationAccounts/README.md} (100%) rename modules/{Microsoft.Automation/automationAccounts/jobSchedules/readme.md => Automation/automationAccounts/jobSchedules/README.md} (100%) rename modules/{Microsoft.Automation => Automation}/automationAccounts/jobSchedules/main.bicep (100%) rename modules/{Microsoft.Automation => Automation}/automationAccounts/jobSchedules/version.json (100%) rename modules/{Microsoft.Automation => Automation}/automationAccounts/main.bicep (100%) rename modules/{Microsoft.Automation/automationAccounts/modules/readme.md => Automation/automationAccounts/modules/README.md} (100%) rename modules/{Microsoft.Automation => Automation}/automationAccounts/modules/main.bicep (100%) rename modules/{Microsoft.Automation => Automation}/automationAccounts/modules/version.json (100%) rename modules/{Microsoft.Automation/automationAccounts/runbooks/readme.md => Automation/automationAccounts/runbooks/README.md} (100%) rename modules/{Microsoft.Automation => Automation}/automationAccounts/runbooks/main.bicep (100%) rename modules/{Microsoft.Automation => Automation}/automationAccounts/runbooks/version.json (100%) rename modules/{Microsoft.Automation/automationAccounts/schedules/readme.md => Automation/automationAccounts/schedules/README.md} (100%) rename modules/{Microsoft.Automation => Automation}/automationAccounts/schedules/main.bicep (100%) rename modules/{Microsoft.Automation => Automation}/automationAccounts/schedules/version.json (100%) rename modules/{Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/readme.md => Automation/automationAccounts/softwareUpdateConfigurations/README.md} (100%) rename modules/{Microsoft.Automation => Automation}/automationAccounts/softwareUpdateConfigurations/main.bicep (100%) rename modules/{Microsoft.Automation => Automation}/automationAccounts/softwareUpdateConfigurations/version.json (100%) rename modules/{Microsoft.Automation/automationAccounts/variables/readme.md => Automation/automationAccounts/variables/README.md} (100%) rename modules/{Microsoft.Automation => Automation}/automationAccounts/variables/main.bicep (100%) rename modules/{Microsoft.Automation => Automation}/automationAccounts/variables/version.json (100%) rename modules/{Microsoft.Automation => Automation}/automationAccounts/version.json (100%) rename modules/{Microsoft.Batch => Batch}/batchAccounts/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Batch => Batch}/batchAccounts/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Batch => Batch}/batchAccounts/.test/encr/dependencies.bicep (100%) rename modules/{Microsoft.Batch => Batch}/batchAccounts/.test/encr/main.test.bicep (100%) rename modules/{Microsoft.Batch => Batch}/batchAccounts/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.Batch => Batch}/batchAccounts/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Batch/batchAccounts/readme.md => Batch/batchAccounts/README.md} (100%) rename modules/{Microsoft.Batch => Batch}/batchAccounts/main.bicep (100%) rename modules/{Microsoft.Batch => Batch}/batchAccounts/version.json (100%) rename modules/{Microsoft.CDN => CDN}/profiles/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.CDN => CDN}/profiles/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.CDN => CDN}/profiles/.test/common/main.test.bicep (100%) rename modules/{Microsoft.CDN/profiles/readme.md => CDN/profiles/README.md} (100%) rename modules/{Microsoft.CDN/profiles/endpoints/readme.md => CDN/profiles/endpoints/README.md} (100%) rename modules/{Microsoft.CDN => CDN}/profiles/endpoints/main.bicep (100%) rename modules/{Microsoft.CDN/profiles/endpoints/origins/readme.md => CDN/profiles/endpoints/origins/README.md} (100%) rename modules/{Microsoft.CDN => CDN}/profiles/endpoints/origins/main.bicep (100%) rename modules/{Microsoft.CDN => CDN}/profiles/endpoints/origins/version.json (100%) rename modules/{Microsoft.CDN => CDN}/profiles/endpoints/version.json (100%) rename modules/{Microsoft.CDN => CDN}/profiles/main.bicep (100%) rename modules/{Microsoft.CDN => CDN}/profiles/version.json (100%) rename modules/{Microsoft.Cache => Cache}/redis/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Cache => Cache}/redis/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Cache => Cache}/redis/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Cache => Cache}/redis/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Cache/redis/readme.md => Cache/redis/README.md} (100%) rename modules/{Microsoft.Cache => Cache}/redis/main.bicep (100%) rename modules/{Microsoft.Cache => Cache}/redis/version.json (100%) rename modules/{Microsoft.CognitiveServices => CognitiveServices}/accounts/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.CognitiveServices => CognitiveServices}/accounts/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.CognitiveServices => CognitiveServices}/accounts/.test/common/main.test.bicep (100%) rename modules/{Microsoft.CognitiveServices => CognitiveServices}/accounts/.test/encr/dependencies.bicep (100%) rename modules/{Microsoft.CognitiveServices => CognitiveServices}/accounts/.test/encr/main.test.bicep (100%) rename modules/{Microsoft.CognitiveServices => CognitiveServices}/accounts/.test/min/main.test.bicep (100%) rename modules/{Microsoft.CognitiveServices => CognitiveServices}/accounts/.test/speech/dependencies.bicep (100%) rename modules/{Microsoft.CognitiveServices => CognitiveServices}/accounts/.test/speech/main.test.bicep (100%) rename modules/{Microsoft.CognitiveServices/accounts/readme.md => CognitiveServices/accounts/README.md} (100%) rename modules/{Microsoft.CognitiveServices => CognitiveServices}/accounts/main.bicep (100%) rename modules/{Microsoft.CognitiveServices => CognitiveServices}/accounts/version.json (100%) rename modules/{Microsoft.Compute => Compute}/availabilitySets/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Compute => Compute}/availabilitySets/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/availabilitySets/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Compute => Compute}/availabilitySets/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Compute/availabilitySets/readme.md => Compute/availabilitySets/README.md} (100%) rename modules/{Microsoft.Compute => Compute}/availabilitySets/main.bicep (100%) rename modules/{Microsoft.Compute => Compute}/availabilitySets/version.json (100%) rename modules/{Microsoft.Compute => Compute}/diskEncryptionSets/.bicep/nested_keyVaultPermissions.bicep (100%) rename modules/{Microsoft.Compute => Compute}/diskEncryptionSets/.bicep/nested_managedIdentityReference.bicep (100%) rename modules/{Microsoft.Compute => Compute}/diskEncryptionSets/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Compute => Compute}/diskEncryptionSets/.test/accessPolicies/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/diskEncryptionSets/.test/accessPolicies/main.test.bicep (100%) rename modules/{Microsoft.Compute => Compute}/diskEncryptionSets/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/diskEncryptionSets/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Compute/diskEncryptionSets/readme.md => Compute/diskEncryptionSets/README.md} (100%) rename modules/{Microsoft.Compute => Compute}/diskEncryptionSets/main.bicep (100%) rename modules/{Microsoft.Compute => Compute}/diskEncryptionSets/version.json (100%) rename modules/{Microsoft.Compute => Compute}/disks/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Compute => Compute}/disks/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/disks/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Compute => Compute}/disks/.test/image/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/disks/.test/image/main.test.bicep (100%) rename modules/{Microsoft.Compute => Compute}/disks/.test/import/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/disks/.test/import/dependencies_rbac.bicep (100%) rename modules/{Microsoft.Compute => Compute}/disks/.test/import/main.test.bicep (100%) rename modules/{Microsoft.Compute => Compute}/disks/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Compute/disks/readme.md => Compute/disks/README.md} (100%) rename modules/{Microsoft.Compute => Compute}/disks/main.bicep (100%) rename modules/{Microsoft.Compute => Compute}/disks/version.json (100%) rename modules/{Microsoft.Compute => Compute}/galleries/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Compute => Compute}/galleries/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/galleries/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Compute => Compute}/galleries/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Compute/galleries/readme.md => Compute/galleries/README.md} (100%) rename modules/{Microsoft.Compute => Compute}/galleries/applications/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Compute/galleries/applications/readme.md => Compute/galleries/applications/README.md} (100%) rename modules/{Microsoft.Compute => Compute}/galleries/applications/main.bicep (100%) rename modules/{Microsoft.Compute => Compute}/galleries/applications/version.json (100%) rename modules/{Microsoft.Compute => Compute}/galleries/images/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Compute/galleries/images/readme.md => Compute/galleries/images/README.md} (100%) rename modules/{Microsoft.Compute => Compute}/galleries/images/main.bicep (100%) rename modules/{Microsoft.Compute => Compute}/galleries/images/version.json (100%) rename modules/{Microsoft.Compute => Compute}/galleries/main.bicep (100%) rename modules/{Microsoft.Compute => Compute}/galleries/version.json (100%) rename modules/{Microsoft.Compute => Compute}/images/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Compute => Compute}/images/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/images/.test/common/dependencies_rbac.bicep (100%) rename modules/{Microsoft.Compute => Compute}/images/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Compute/images/readme.md => Compute/images/README.md} (100%) rename modules/{Microsoft.Compute => Compute}/images/main.bicep (100%) rename modules/{Microsoft.Compute => Compute}/images/version.json (100%) rename modules/{Microsoft.Compute => Compute}/proximityPlacementGroups/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Compute => Compute}/proximityPlacementGroups/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/proximityPlacementGroups/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Compute => Compute}/proximityPlacementGroups/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Compute/proximityPlacementGroups/readme.md => Compute/proximityPlacementGroups/README.md} (100%) rename modules/{Microsoft.Compute => Compute}/proximityPlacementGroups/main.bicep (100%) rename modules/{Microsoft.Compute => Compute}/proximityPlacementGroups/version.json (100%) rename modules/{Microsoft.Compute => Compute}/sshPublicKeys/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Compute => Compute}/sshPublicKeys/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/sshPublicKeys/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Compute => Compute}/sshPublicKeys/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Compute/sshPublicKeys/readme.md => Compute/sshPublicKeys/README.md} (100%) rename modules/{Microsoft.Compute => Compute}/sshPublicKeys/main.bicep (100%) rename modules/{Microsoft.Compute => Compute}/sshPublicKeys/version.json (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachineScaleSets/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachineScaleSets/.test/linux.min/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachineScaleSets/.test/linux.min/main.test.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachineScaleSets/.test/linux.ssecmk/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachineScaleSets/.test/linux.ssecmk/main.test.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachineScaleSets/.test/linux/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachineScaleSets/.test/linux/main.test.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachineScaleSets/.test/windows.min/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachineScaleSets/.test/windows.min/main.test.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachineScaleSets/.test/windows/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachineScaleSets/.test/windows/main.test.bicep (100%) rename modules/{Microsoft.Compute/virtualMachineScaleSets/readme.md => Compute/virtualMachineScaleSets/README.md} (100%) rename modules/{Microsoft.Compute/virtualMachineScaleSets/extensions/readme.md => Compute/virtualMachineScaleSets/extensions/README.md} (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachineScaleSets/extensions/main.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachineScaleSets/extensions/version.json (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachineScaleSets/main.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachineScaleSets/version.json (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachines/.bicep/nested_networkInterface.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachines/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachines/.test/linux.atmg/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachines/.test/linux.atmg/main.test.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachines/.test/linux.min/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachines/.test/linux.min/main.test.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachines/.test/linux/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachines/.test/linux/main.test.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachines/.test/windows.atmg/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachines/.test/windows.atmg/main.test.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachines/.test/windows.min/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachines/.test/windows.min/main.test.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachines/.test/windows.ssecmk/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachines/.test/windows.ssecmk/main.test.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachines/.test/windows/dependencies.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachines/.test/windows/main.test.bicep (100%) rename modules/{Microsoft.Compute/virtualMachines/readme.md => Compute/virtualMachines/README.md} (100%) rename modules/{Microsoft.Compute/virtualMachines/extensions/readme.md => Compute/virtualMachines/extensions/README.md} (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachines/extensions/main.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachines/extensions/version.json (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachines/main.bicep (100%) rename modules/{Microsoft.Compute => Compute}/virtualMachines/version.json (100%) rename modules/{Microsoft.Consumption => Consumption}/budgets/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Consumption => Consumption}/budgets/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Consumption/budgets/readme.md => Consumption/budgets/README.md} (100%) rename modules/{Microsoft.Consumption => Consumption}/budgets/main.bicep (100%) rename modules/{Microsoft.Consumption => Consumption}/budgets/version.json (100%) rename modules/{Microsoft.ContainerInstance => ContainerInstance}/containerGroups/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.ContainerInstance => ContainerInstance}/containerGroups/.test/common/main.test.bicep (100%) rename modules/{Microsoft.ContainerInstance => ContainerInstance}/containerGroups/.test/encr/dependencies.bicep (100%) rename modules/{Microsoft.ContainerInstance => ContainerInstance}/containerGroups/.test/encr/main.test.bicep (100%) rename modules/{Microsoft.ContainerInstance => ContainerInstance}/containerGroups/.test/min/main.test.bicep (100%) rename modules/{Microsoft.ContainerInstance => ContainerInstance}/containerGroups/.test/private/dependencies.bicep (100%) rename modules/{Microsoft.ContainerInstance => ContainerInstance}/containerGroups/.test/private/main.test.bicep (100%) rename modules/{Microsoft.ContainerInstance/containerGroups/readme.md => ContainerInstance/containerGroups/README.md} (100%) rename modules/{Microsoft.ContainerInstance => ContainerInstance}/containerGroups/main.bicep (100%) rename modules/{Microsoft.ContainerInstance => ContainerInstance}/containerGroups/version.json (100%) rename modules/{Microsoft.ContainerRegistry => ContainerRegistry}/registries/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.ContainerRegistry => ContainerRegistry}/registries/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.ContainerRegistry => ContainerRegistry}/registries/.test/common/main.test.bicep (100%) rename modules/{Microsoft.ContainerRegistry => ContainerRegistry}/registries/.test/encr/dependencies.bicep (100%) rename modules/{Microsoft.ContainerRegistry => ContainerRegistry}/registries/.test/encr/main.test.bicep (100%) rename modules/{Microsoft.ContainerRegistry => ContainerRegistry}/registries/.test/min/main.test.bicep (100%) rename modules/{Microsoft.ContainerRegistry => ContainerRegistry}/registries/.test/pe/dependencies.bicep (100%) rename modules/{Microsoft.ContainerRegistry => ContainerRegistry}/registries/.test/pe/main.test.bicep (100%) rename modules/{Microsoft.ContainerRegistry/registries/readme.md => ContainerRegistry/registries/README.md} (100%) rename modules/{Microsoft.ContainerRegistry => ContainerRegistry}/registries/main.bicep (100%) rename modules/{Microsoft.ContainerRegistry/registries/replications/readme.md => ContainerRegistry/registries/replications/README.md} (100%) rename modules/{Microsoft.ContainerRegistry => ContainerRegistry}/registries/replications/main.bicep (100%) rename modules/{Microsoft.ContainerRegistry => ContainerRegistry}/registries/replications/version.json (100%) rename modules/{Microsoft.ContainerRegistry => ContainerRegistry}/registries/version.json (100%) rename modules/{Microsoft.ContainerRegistry/registries/webhooks/readme.md => ContainerRegistry/registries/webhooks/README.md} (100%) rename modules/{Microsoft.ContainerRegistry => ContainerRegistry}/registries/webhooks/main.bicep (100%) rename modules/{Microsoft.ContainerRegistry => ContainerRegistry}/registries/webhooks/version.json (100%) rename modules/{Microsoft.ContainerService => ContainerService}/managedClusters/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.ContainerService => ContainerService}/managedClusters/.test/azure/dependencies.bicep (100%) rename modules/{Microsoft.ContainerService => ContainerService}/managedClusters/.test/azure/main.test.bicep (100%) rename modules/{Microsoft.ContainerService => ContainerService}/managedClusters/.test/kubenet/dependencies.bicep (100%) rename modules/{Microsoft.ContainerService => ContainerService}/managedClusters/.test/kubenet/main.test.bicep (100%) rename modules/{Microsoft.ContainerService => ContainerService}/managedClusters/.test/min/main.test.bicep (100%) rename modules/{Microsoft.ContainerService/managedClusters/readme.md => ContainerService/managedClusters/README.md} (100%) rename modules/{Microsoft.ContainerService/managedClusters/agentPools/readme.md => ContainerService/managedClusters/agentPools/README.md} (100%) rename modules/{Microsoft.ContainerService => ContainerService}/managedClusters/agentPools/main.bicep (100%) rename modules/{Microsoft.ContainerService => ContainerService}/managedClusters/agentPools/version.json (100%) rename modules/{Microsoft.ContainerService => ContainerService}/managedClusters/main.bicep (100%) rename modules/{Microsoft.ContainerService => ContainerService}/managedClusters/version.json (100%) rename modules/{Microsoft.DBforMySQL => DBforMySQL}/flexibleServers/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.DBforMySQL => DBforMySQL}/flexibleServers/.test/min/main.test.bicep (100%) rename modules/{Microsoft.DBforMySQL => DBforMySQL}/flexibleServers/.test/private/dependencies.bicep (100%) rename modules/{Microsoft.DBforMySQL => DBforMySQL}/flexibleServers/.test/private/main.test.bicep (100%) rename modules/{Microsoft.DBforMySQL => DBforMySQL}/flexibleServers/.test/public/dependencies1.bicep (100%) rename modules/{Microsoft.DBforMySQL => DBforMySQL}/flexibleServers/.test/public/dependencies2.bicep (100%) rename modules/{Microsoft.DBforMySQL => DBforMySQL}/flexibleServers/.test/public/main.test.bicep (100%) rename modules/{Microsoft.DBforMySQL/flexibleServers/readme.md => DBforMySQL/flexibleServers/README.md} (100%) rename modules/{Microsoft.DBforMySQL/flexibleServers/databases/readme.md => DBforMySQL/flexibleServers/databases/README.md} (100%) rename modules/{Microsoft.DBforMySQL => DBforMySQL}/flexibleServers/databases/main.bicep (100%) rename modules/{Microsoft.DBforMySQL => DBforMySQL}/flexibleServers/databases/version.json (100%) rename modules/{Microsoft.DBforMySQL/flexibleServers/firewallRules/readme.md => DBforMySQL/flexibleServers/firewallRules/README.md} (100%) rename modules/{Microsoft.DBforMySQL => DBforMySQL}/flexibleServers/firewallRules/main.bicep (100%) rename modules/{Microsoft.DBforMySQL => DBforMySQL}/flexibleServers/firewallRules/version.json (100%) rename modules/{Microsoft.DBforMySQL => DBforMySQL}/flexibleServers/main.bicep (100%) rename modules/{Microsoft.DBforMySQL => DBforMySQL}/flexibleServers/version.json (100%) rename modules/{Microsoft.DBforPostgreSQL => DBforPostgreSQL}/flexibleServers/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.DBforPostgreSQL => DBforPostgreSQL}/flexibleServers/.test/min/main.test.bicep (100%) rename modules/{Microsoft.DBforPostgreSQL => DBforPostgreSQL}/flexibleServers/.test/private/dependencies.bicep (100%) rename modules/{Microsoft.DBforPostgreSQL => DBforPostgreSQL}/flexibleServers/.test/private/main.test.bicep (100%) rename modules/{Microsoft.DBforPostgreSQL => DBforPostgreSQL}/flexibleServers/.test/public/dependencies.bicep (100%) rename modules/{Microsoft.DBforPostgreSQL => DBforPostgreSQL}/flexibleServers/.test/public/main.test.bicep (100%) rename modules/{Microsoft.DBforPostgreSQL/flexibleServers/readme.md => DBforPostgreSQL/flexibleServers/README.md} (100%) rename modules/{Microsoft.DBforPostgreSQL/flexibleServers/configurations/readme.md => DBforPostgreSQL/flexibleServers/configurations/README.md} (100%) rename modules/{Microsoft.DBforPostgreSQL => DBforPostgreSQL}/flexibleServers/configurations/main.bicep (100%) rename modules/{Microsoft.DBforPostgreSQL => DBforPostgreSQL}/flexibleServers/configurations/version.json (100%) rename modules/{Microsoft.DBforPostgreSQL/flexibleServers/databases/readme.md => DBforPostgreSQL/flexibleServers/databases/README.md} (100%) rename modules/{Microsoft.DBforPostgreSQL => DBforPostgreSQL}/flexibleServers/databases/main.bicep (100%) rename modules/{Microsoft.DBforPostgreSQL => DBforPostgreSQL}/flexibleServers/databases/version.json (100%) rename modules/{Microsoft.DBforPostgreSQL/flexibleServers/firewallRules/readme.md => DBforPostgreSQL/flexibleServers/firewallRules/README.md} (100%) rename modules/{Microsoft.DBforPostgreSQL => DBforPostgreSQL}/flexibleServers/firewallRules/main.bicep (100%) rename modules/{Microsoft.DBforPostgreSQL => DBforPostgreSQL}/flexibleServers/firewallRules/version.json (100%) rename modules/{Microsoft.DBforPostgreSQL => DBforPostgreSQL}/flexibleServers/main.bicep (100%) rename modules/{Microsoft.DBforPostgreSQL => DBforPostgreSQL}/flexibleServers/version.json (100%) rename modules/{Microsoft.DataFactory => DataFactory}/factories/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.DataFactory => DataFactory}/factories/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.DataFactory => DataFactory}/factories/.test/common/main.test.bicep (100%) rename modules/{Microsoft.DataFactory => DataFactory}/factories/.test/min/main.test.bicep (100%) rename modules/{Microsoft.DataFactory/factories/readme.md => DataFactory/factories/README.md} (100%) rename modules/{Microsoft.DataFactory/factories/integrationRuntimes/readme.md => DataFactory/factories/integrationRuntimes/README.md} (100%) rename modules/{Microsoft.DataFactory => DataFactory}/factories/integrationRuntimes/main.bicep (100%) rename modules/{Microsoft.DataFactory => DataFactory}/factories/integrationRuntimes/version.json (100%) rename modules/{Microsoft.DataFactory => DataFactory}/factories/main.bicep (100%) rename modules/{Microsoft.DataFactory/factories/managedVirtualNetworks/readme.md => DataFactory/factories/managedVirtualNetworks/README.md} (100%) rename modules/{Microsoft.DataFactory => DataFactory}/factories/managedVirtualNetworks/main.bicep (100%) rename modules/{Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/readme.md => DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/README.md} (100%) rename modules/{Microsoft.DataFactory => DataFactory}/factories/managedVirtualNetworks/managedPrivateEndpoints/main.bicep (100%) rename modules/{Microsoft.DataFactory => DataFactory}/factories/managedVirtualNetworks/managedPrivateEndpoints/version.json (100%) rename modules/{Microsoft.DataFactory => DataFactory}/factories/managedVirtualNetworks/version.json (100%) rename modules/{Microsoft.DataFactory => DataFactory}/factories/version.json (100%) rename modules/{Microsoft.DataProtection => DataProtection}/backupVaults/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.DataProtection => DataProtection}/backupVaults/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.DataProtection => DataProtection}/backupVaults/.test/common/main.test.bicep (100%) rename modules/{Microsoft.DataProtection => DataProtection}/backupVaults/.test/min/main.test.bicep (100%) rename modules/{Microsoft.DataProtection/backupVaults/readme.md => DataProtection/backupVaults/README.md} (100%) rename modules/{Microsoft.DataProtection/backupVaults/backupPolicies/readme.md => DataProtection/backupVaults/backupPolicies/README.md} (100%) rename modules/{Microsoft.DataProtection => DataProtection}/backupVaults/backupPolicies/main.bicep (100%) rename modules/{Microsoft.DataProtection => DataProtection}/backupVaults/backupPolicies/version.json (100%) rename modules/{Microsoft.DataProtection => DataProtection}/backupVaults/main.bicep (100%) rename modules/{Microsoft.DataProtection => DataProtection}/backupVaults/version.json (100%) rename modules/{Microsoft.Databricks => Databricks}/workspaces/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Databricks => Databricks}/workspaces/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Databricks => Databricks}/workspaces/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Databricks/workspaces/readme.md => Databricks/workspaces/README.md} (100%) rename modules/{Microsoft.Databricks => Databricks}/workspaces/main.bicep (100%) rename modules/{Microsoft.Databricks => Databricks}/workspaces/version.json (100%) rename modules/{Microsoft.DevTestLab => DevTestLab}/labs/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.DevTestLab => DevTestLab}/labs/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.DevTestLab => DevTestLab}/labs/.test/common/main.test.bicep (100%) rename modules/{Microsoft.DevTestLab => DevTestLab}/labs/.test/min/main.test.bicep (100%) rename modules/{Microsoft.DevTestLab/labs/readme.md => DevTestLab/labs/README.md} (100%) rename modules/{Microsoft.DevTestLab/labs/artifactSources/readme.md => DevTestLab/labs/artifactSources/README.md} (100%) rename modules/{Microsoft.DevTestLab => DevTestLab}/labs/artifactSources/main.bicep (100%) rename modules/{Microsoft.DevTestLab => DevTestLab}/labs/artifactSources/version.json (100%) rename modules/{Microsoft.DevTestLab/labs/costs/readme.md => DevTestLab/labs/costs/README.md} (100%) rename modules/{Microsoft.DevTestLab => DevTestLab}/labs/costs/main.bicep (100%) rename modules/{Microsoft.DevTestLab => DevTestLab}/labs/costs/version.json (100%) rename modules/{Microsoft.DevTestLab => DevTestLab}/labs/main.bicep (100%) rename modules/{Microsoft.DevTestLab/labs/notificationChannels/readme.md => DevTestLab/labs/notificationChannels/README.md} (100%) rename modules/{Microsoft.DevTestLab => DevTestLab}/labs/notificationChannels/main.bicep (100%) rename modules/{Microsoft.DevTestLab => DevTestLab}/labs/notificationChannels/version.json (100%) rename modules/{Microsoft.DevTestLab/labs/policySets/policies/readme.md => DevTestLab/labs/policySets/policies/README.md} (100%) rename modules/{Microsoft.DevTestLab => DevTestLab}/labs/policySets/policies/main.bicep (100%) rename modules/{Microsoft.DevTestLab => DevTestLab}/labs/policySets/policies/version.json (100%) rename modules/{Microsoft.DevTestLab/labs/schedules/readme.md => DevTestLab/labs/schedules/README.md} (100%) rename modules/{Microsoft.DevTestLab => DevTestLab}/labs/schedules/main.bicep (100%) rename modules/{Microsoft.DevTestLab => DevTestLab}/labs/schedules/version.json (100%) rename modules/{Microsoft.DevTestLab => DevTestLab}/labs/version.json (100%) rename modules/{Microsoft.DevTestLab/labs/virtualNetworks/readme.md => DevTestLab/labs/virtualNetworks/README.md} (100%) rename modules/{Microsoft.DevTestLab => DevTestLab}/labs/virtualNetworks/main.bicep (100%) rename modules/{Microsoft.DevTestLab => DevTestLab}/labs/virtualNetworks/version.json (100%) rename modules/{Microsoft.DigitalTwins => DigitalTwins}/digitalTwinsInstances/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.DigitalTwins => DigitalTwins}/digitalTwinsInstances/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.DigitalTwins => DigitalTwins}/digitalTwinsInstances/.test/common/main.test.bicep (100%) rename modules/{Microsoft.DigitalTwins => DigitalTwins}/digitalTwinsInstances/.test/min/main.test.bicep (100%) rename modules/{Microsoft.DigitalTwins/digitalTwinsInstances/readme.md => DigitalTwins/digitalTwinsInstances/README.md} (100%) rename modules/{Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/readme.md => DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/README.md} (100%) rename modules/{Microsoft.DigitalTwins => DigitalTwins}/digitalTwinsInstances/endpoints-eventGrid/main.bicep (100%) rename modules/{Microsoft.DigitalTwins => DigitalTwins}/digitalTwinsInstances/endpoints-eventGrid/version.json (100%) rename modules/{Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventHub/readme.md => DigitalTwins/digitalTwinsInstances/endpoints-eventHub/README.md} (100%) rename modules/{Microsoft.DigitalTwins => DigitalTwins}/digitalTwinsInstances/endpoints-eventHub/main.bicep (100%) rename modules/{Microsoft.DigitalTwins => DigitalTwins}/digitalTwinsInstances/endpoints-eventHub/version.json (100%) rename modules/{Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/readme.md => DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/README.md} (100%) rename modules/{Microsoft.DigitalTwins => DigitalTwins}/digitalTwinsInstances/endpoints-serviceBus/main.bicep (100%) rename modules/{Microsoft.DigitalTwins => DigitalTwins}/digitalTwinsInstances/endpoints-serviceBus/version.json (100%) rename modules/{Microsoft.DigitalTwins => DigitalTwins}/digitalTwinsInstances/main.bicep (100%) rename modules/{Microsoft.DigitalTwins => DigitalTwins}/digitalTwinsInstances/version.json (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/.test/gremlindb/dependencies.bicep (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/.test/gremlindb/main.test.bicep (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/.test/mongodb/dependencies.bicep (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/.test/mongodb/main.test.bicep (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/.test/plain/dependencies.bicep (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/.test/plain/main.test.bicep (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/.test/sqldb/dependencies.bicep (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/.test/sqldb/main.test.bicep (100%) rename modules/{Microsoft.DocumentDB/databaseAccounts/readme.md => DocumentDB/databaseAccounts/README.md} (100%) rename modules/{Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/readme.md => DocumentDB/databaseAccounts/gremlinDatabases/README.md} (100%) rename modules/{Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/graphs/readme.md => DocumentDB/databaseAccounts/gremlinDatabases/graphs/README.md} (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/gremlinDatabases/graphs/main.bicep (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/gremlinDatabases/graphs/version.json (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/gremlinDatabases/main.bicep (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/gremlinDatabases/version.json (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/main.bicep (100%) rename modules/{Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/readme.md => DocumentDB/databaseAccounts/mongodbDatabases/README.md} (100%) rename modules/{Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/readme.md => DocumentDB/databaseAccounts/mongodbDatabases/collections/README.md} (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/mongodbDatabases/collections/main.bicep (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/mongodbDatabases/collections/version.json (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/mongodbDatabases/main.bicep (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/mongodbDatabases/version.json (100%) rename modules/{Microsoft.DocumentDB/databaseAccounts/sqlDatabases/readme.md => DocumentDB/databaseAccounts/sqlDatabases/README.md} (100%) rename modules/{Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readme.md => DocumentDB/databaseAccounts/sqlDatabases/containers/README.md} (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/sqlDatabases/containers/main.bicep (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/sqlDatabases/containers/version.json (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/sqlDatabases/main.bicep (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/sqlDatabases/version.json (100%) rename modules/{Microsoft.DocumentDB => DocumentDB}/databaseAccounts/version.json (100%) rename modules/{Microsoft.EventGrid => EventGrid}/domains/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.EventGrid => EventGrid}/domains/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.EventGrid => EventGrid}/domains/.test/common/main.test.bicep (100%) rename modules/{Microsoft.EventGrid => EventGrid}/domains/.test/min/main.test.bicep (100%) rename modules/{Microsoft.EventGrid => EventGrid}/domains/.test/pe/dependencies.bicep (100%) rename modules/{Microsoft.EventGrid => EventGrid}/domains/.test/pe/main.test.bicep (100%) rename modules/{Microsoft.EventGrid/domains/readme.md => EventGrid/domains/README.md} (100%) rename modules/{Microsoft.EventGrid => EventGrid}/domains/main.bicep (100%) rename modules/{Microsoft.EventGrid/domains/topics/readme.md => EventGrid/domains/topics/README.md} (100%) rename modules/{Microsoft.EventGrid => EventGrid}/domains/topics/main.bicep (100%) rename modules/{Microsoft.EventGrid => EventGrid}/domains/topics/version.json (100%) rename modules/{Microsoft.EventGrid => EventGrid}/domains/version.json (100%) rename modules/{Microsoft.EventGrid => EventGrid}/eventSubscriptions/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.EventGrid => EventGrid}/eventSubscriptions/.test/common/main.test.bicep (100%) rename modules/{Microsoft.EventGrid/eventSubscriptions/readme.md => EventGrid/eventSubscriptions/README.md} (100%) rename modules/{Microsoft.EventGrid => EventGrid}/eventSubscriptions/main.bicep (100%) rename modules/{Microsoft.EventGrid => EventGrid}/eventSubscriptions/version.json (100%) rename modules/{Microsoft.EventGrid => EventGrid}/systemTopics/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.EventGrid => EventGrid}/systemTopics/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.EventGrid => EventGrid}/systemTopics/.test/common/main.test.bicep (100%) rename modules/{Microsoft.EventGrid => EventGrid}/systemTopics/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.EventGrid => EventGrid}/systemTopics/.test/min/main.test.bicep (100%) rename modules/{Microsoft.EventGrid/systemTopics/readme.md => EventGrid/systemTopics/README.md} (100%) rename modules/{Microsoft.EventGrid => EventGrid}/systemTopics/main.bicep (100%) rename modules/{Microsoft.EventGrid => EventGrid}/systemTopics/version.json (100%) rename modules/{Microsoft.EventGrid => EventGrid}/topics/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.EventGrid => EventGrid}/topics/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.EventGrid => EventGrid}/topics/.test/common/main.test.bicep (100%) rename modules/{Microsoft.EventGrid => EventGrid}/topics/.test/min/main.test.bicep (100%) rename modules/{Microsoft.EventGrid => EventGrid}/topics/.test/pe/dependencies.bicep (100%) rename modules/{Microsoft.EventGrid => EventGrid}/topics/.test/pe/main.test.bicep (100%) rename modules/{Microsoft.EventGrid/topics/readme.md => EventGrid/topics/README.md} (100%) rename modules/{Microsoft.EventGrid => EventGrid}/topics/main.bicep (100%) rename modules/{Microsoft.EventGrid => EventGrid}/topics/version.json (100%) rename modules/{Microsoft.EventHub => EventHub}/namespaces/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.EventHub => EventHub}/namespaces/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.EventHub => EventHub}/namespaces/.test/common/main.test.bicep (100%) rename modules/{Microsoft.EventHub => EventHub}/namespaces/.test/min/main.test.bicep (100%) rename modules/{Microsoft.EventHub => EventHub}/namespaces/.test/pe/dependencies.bicep (100%) rename modules/{Microsoft.EventHub => EventHub}/namespaces/.test/pe/main.test.bicep (100%) rename modules/{Microsoft.EventHub/namespaces/readme.md => EventHub/namespaces/README.md} (100%) rename modules/{Microsoft.EventHub/namespaces/authorizationRules/readme.md => EventHub/namespaces/authorizationRules/README.md} (100%) rename modules/{Microsoft.EventHub => EventHub}/namespaces/authorizationRules/main.bicep (100%) rename modules/{Microsoft.EventHub => EventHub}/namespaces/authorizationRules/version.json (100%) rename modules/{Microsoft.EventHub/namespaces/disasterRecoveryConfigs/readme.md => EventHub/namespaces/disasterRecoveryConfigs/README.md} (100%) rename modules/{Microsoft.EventHub => EventHub}/namespaces/disasterRecoveryConfigs/main.bicep (100%) rename modules/{Microsoft.EventHub => EventHub}/namespaces/disasterRecoveryConfigs/version.json (100%) rename modules/{Microsoft.EventHub => EventHub}/namespaces/eventHubs/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.EventHub/namespaces/eventHubs/readme.md => EventHub/namespaces/eventHubs/README.md} (100%) rename modules/{Microsoft.EventHub/namespaces/eventHubs/authorizationRules/readme.md => EventHub/namespaces/eventHubs/authorizationRules/README.md} (100%) rename modules/{Microsoft.EventHub => EventHub}/namespaces/eventHubs/authorizationRules/main.bicep (100%) rename modules/{Microsoft.EventHub => EventHub}/namespaces/eventHubs/authorizationRules/version.json (100%) rename modules/{Microsoft.EventHub/namespaces/eventHubs/consumerGroups/readme.md => EventHub/namespaces/eventHubs/consumerGroups/README.md} (100%) rename modules/{Microsoft.EventHub => EventHub}/namespaces/eventHubs/consumerGroups/main.bicep (100%) rename modules/{Microsoft.EventHub => EventHub}/namespaces/eventHubs/consumerGroups/version.json (100%) rename modules/{Microsoft.EventHub => EventHub}/namespaces/eventHubs/main.bicep (100%) rename modules/{Microsoft.EventHub => EventHub}/namespaces/eventHubs/version.json (100%) rename modules/{Microsoft.EventHub => EventHub}/namespaces/main.bicep (100%) rename modules/{Microsoft.EventHub/namespaces/networkRuleSets/readme.md => EventHub/namespaces/networkRuleSets/README.md} (100%) rename modules/{Microsoft.EventHub => EventHub}/namespaces/networkRuleSets/main.bicep (100%) rename modules/{Microsoft.EventHub => EventHub}/namespaces/networkRuleSets/version.json (100%) rename modules/{Microsoft.EventHub => EventHub}/namespaces/version.json (100%) rename modules/{Microsoft.HealthBot => HealthBot}/healthBots/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.HealthBot => HealthBot}/healthBots/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.HealthBot => HealthBot}/healthBots/.test/common/main.test.bicep (100%) rename modules/{Microsoft.HealthBot => HealthBot}/healthBots/.test/min/main.test.bicep (100%) rename modules/{Microsoft.HealthBot/healthBots/readme.md => HealthBot/healthBots/README.md} (100%) rename modules/{Microsoft.HealthBot => HealthBot}/healthBots/main.bicep (100%) rename modules/{Microsoft.HealthBot => HealthBot}/healthBots/version.json (100%) rename modules/{Microsoft.HealthcareApis => HealthcareApis}/workspaces/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.HealthcareApis => HealthcareApis}/workspaces/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.HealthcareApis => HealthcareApis}/workspaces/.test/common/main.test.bicep (100%) rename modules/{Microsoft.HealthcareApis => HealthcareApis}/workspaces/.test/min/main.test.bicep (100%) rename modules/{Microsoft.HealthcareApis/workspaces/readme.md => HealthcareApis/workspaces/README.md} (100%) rename modules/{Microsoft.HealthcareApis/workspaces/dicomservices/readme.md => HealthcareApis/workspaces/dicomservices/README.md} (100%) rename modules/{Microsoft.HealthcareApis => HealthcareApis}/workspaces/dicomservices/main.bicep (100%) rename modules/{Microsoft.HealthcareApis => HealthcareApis}/workspaces/dicomservices/version.json (100%) rename modules/{Microsoft.HealthcareApis => HealthcareApis}/workspaces/fhirservices/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.HealthcareApis/workspaces/fhirservices/readme.md => HealthcareApis/workspaces/fhirservices/README.md} (100%) rename modules/{Microsoft.HealthcareApis => HealthcareApis}/workspaces/fhirservices/main.bicep (100%) rename modules/{Microsoft.HealthcareApis => HealthcareApis}/workspaces/fhirservices/version.json (100%) rename modules/{Microsoft.HealthcareApis/workspaces/iotconnectors/readme.md => HealthcareApis/workspaces/iotconnectors/README.md} (100%) rename modules/{Microsoft.HealthcareApis/workspaces/iotconnectors/fhirdestinations/readme.md => HealthcareApis/workspaces/iotconnectors/fhirdestinations/README.md} (100%) rename modules/{Microsoft.HealthcareApis => HealthcareApis}/workspaces/iotconnectors/fhirdestinations/main.bicep (100%) rename modules/{Microsoft.HealthcareApis => HealthcareApis}/workspaces/iotconnectors/fhirdestinations/version.json (100%) rename modules/{Microsoft.HealthcareApis => HealthcareApis}/workspaces/iotconnectors/main.bicep (100%) rename modules/{Microsoft.HealthcareApis => HealthcareApis}/workspaces/iotconnectors/version.json (100%) rename modules/{Microsoft.HealthcareApis => HealthcareApis}/workspaces/main.bicep (100%) rename modules/{Microsoft.HealthcareApis => HealthcareApis}/workspaces/version.json (100%) rename modules/{Microsoft.Insights => Insights}/actionGroups/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Insights => Insights}/actionGroups/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Insights => Insights}/actionGroups/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Insights => Insights}/actionGroups/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Insights/actionGroups/readme.md => Insights/actionGroups/README.md} (100%) rename modules/{Microsoft.Insights => Insights}/actionGroups/main.bicep (100%) rename modules/{Microsoft.Insights => Insights}/actionGroups/version.json (100%) rename modules/{Microsoft.Insights => Insights}/activityLogAlerts/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Insights => Insights}/activityLogAlerts/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Insights => Insights}/activityLogAlerts/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Insights/activityLogAlerts/readme.md => Insights/activityLogAlerts/README.md} (100%) rename modules/{Microsoft.Insights => Insights}/activityLogAlerts/main.bicep (100%) rename modules/{Microsoft.Insights => Insights}/activityLogAlerts/version.json (100%) rename modules/{Microsoft.Insights => Insights}/components/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Insights => Insights}/components/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Insights => Insights}/components/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Insights => Insights}/components/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.Insights => Insights}/components/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Insights/components/readme.md => Insights/components/README.md} (100%) rename modules/{Microsoft.Insights => Insights}/components/main.bicep (100%) rename modules/{Microsoft.Insights => Insights}/components/version.json (100%) rename modules/{Microsoft.Insights => Insights}/dataCollectionEndpoints/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Insights => Insights}/dataCollectionEndpoints/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Insights => Insights}/dataCollectionEndpoints/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Insights => Insights}/dataCollectionEndpoints/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Insights/dataCollectionEndpoints/readme.md => Insights/dataCollectionEndpoints/README.md} (100%) rename modules/{Microsoft.Insights => Insights}/dataCollectionEndpoints/main.bicep (100%) rename modules/{Microsoft.Insights => Insights}/dataCollectionEndpoints/version.json (100%) rename modules/{Microsoft.Insights => Insights}/dataCollectionRules/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Insights => Insights}/dataCollectionRules/.test/customadv/dependencies.bicep (100%) rename modules/{Microsoft.Insights => Insights}/dataCollectionRules/.test/customadv/main.test.bicep (100%) rename modules/{Microsoft.Insights => Insights}/dataCollectionRules/.test/custombasic/dependencies.bicep (100%) rename modules/{Microsoft.Insights => Insights}/dataCollectionRules/.test/custombasic/main.test.bicep (100%) rename modules/{Microsoft.Insights => Insights}/dataCollectionRules/.test/customiis/dependencies.bicep (100%) rename modules/{Microsoft.Insights => Insights}/dataCollectionRules/.test/customiis/main.test.bicep (100%) rename modules/{Microsoft.Insights => Insights}/dataCollectionRules/.test/linux/dependencies.bicep (100%) rename modules/{Microsoft.Insights => Insights}/dataCollectionRules/.test/linux/main.test.bicep (100%) rename modules/{Microsoft.Insights => Insights}/dataCollectionRules/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Insights => Insights}/dataCollectionRules/.test/windows/dependencies.bicep (100%) rename modules/{Microsoft.Insights => Insights}/dataCollectionRules/.test/windows/main.test.bicep (100%) rename modules/{Microsoft.Insights/dataCollectionRules/readme.md => Insights/dataCollectionRules/README.md} (100%) rename modules/{Microsoft.Insights => Insights}/dataCollectionRules/main.bicep (100%) rename modules/{Microsoft.Insights => Insights}/dataCollectionRules/version.json (100%) rename modules/{Microsoft.Insights => Insights}/diagnosticSettings/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Insights/diagnosticSettings/readme.md => Insights/diagnosticSettings/README.md} (100%) rename modules/{Microsoft.Insights => Insights}/diagnosticSettings/main.bicep (100%) rename modules/{Microsoft.Insights => Insights}/diagnosticSettings/version.json (100%) rename modules/{Microsoft.Insights => Insights}/metricAlerts/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Insights => Insights}/metricAlerts/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Insights => Insights}/metricAlerts/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Insights/metricAlerts/readme.md => Insights/metricAlerts/README.md} (100%) rename modules/{Microsoft.Insights => Insights}/metricAlerts/main.bicep (100%) rename modules/{Microsoft.Insights => Insights}/metricAlerts/version.json (100%) rename modules/{Microsoft.Insights => Insights}/privateLinkScopes/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Insights => Insights}/privateLinkScopes/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Insights => Insights}/privateLinkScopes/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Insights => Insights}/privateLinkScopes/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Insights/privateLinkScopes/readme.md => Insights/privateLinkScopes/README.md} (100%) rename modules/{Microsoft.Insights => Insights}/privateLinkScopes/main.bicep (100%) rename modules/{Microsoft.Insights/privateLinkScopes/scopedResources/readme.md => Insights/privateLinkScopes/scopedResources/README.md} (100%) rename modules/{Microsoft.Insights => Insights}/privateLinkScopes/scopedResources/main.bicep (100%) rename modules/{Microsoft.Insights => Insights}/privateLinkScopes/scopedResources/version.json (100%) rename modules/{Microsoft.Insights => Insights}/privateLinkScopes/version.json (100%) rename modules/{Microsoft.Insights => Insights}/scheduledQueryRules/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Insights => Insights}/scheduledQueryRules/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Insights => Insights}/scheduledQueryRules/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Insights/scheduledQueryRules/readme.md => Insights/scheduledQueryRules/README.md} (100%) rename modules/{Microsoft.Insights => Insights}/scheduledQueryRules/main.bicep (100%) rename modules/{Microsoft.Insights => Insights}/scheduledQueryRules/version.json (100%) rename modules/{Microsoft.Insights => Insights}/webTests/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Insights => Insights}/webTests/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Insights => Insights}/webTests/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Insights => Insights}/webTests/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.Insights => Insights}/webTests/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Insights/webTests/readme.md => Insights/webTests/README.md} (100%) rename modules/{Microsoft.Insights => Insights}/webTests/main.bicep (100%) rename modules/{Microsoft.Insights => Insights}/webTests/version.json (100%) rename modules/{Microsoft.KeyVault => KeyVault}/vaults/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.KeyVault => KeyVault}/vaults/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.KeyVault => KeyVault}/vaults/.test/common/main.test.bicep (100%) rename modules/{Microsoft.KeyVault => KeyVault}/vaults/.test/min/main.test.bicep (100%) rename modules/{Microsoft.KeyVault => KeyVault}/vaults/.test/pe/dependencies.bicep (100%) rename modules/{Microsoft.KeyVault => KeyVault}/vaults/.test/pe/main.test.bicep (100%) rename modules/{Microsoft.KeyVault/vaults/readme.md => KeyVault/vaults/README.md} (100%) rename modules/{Microsoft.KeyVault/vaults/accessPolicies/readme.md => KeyVault/vaults/accessPolicies/README.md} (100%) rename modules/{Microsoft.KeyVault => KeyVault}/vaults/accessPolicies/main.bicep (100%) rename modules/{Microsoft.KeyVault => KeyVault}/vaults/accessPolicies/version.json (100%) rename modules/{Microsoft.KeyVault => KeyVault}/vaults/keys/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.KeyVault/vaults/keys/readme.md => KeyVault/vaults/keys/README.md} (100%) rename modules/{Microsoft.KeyVault => KeyVault}/vaults/keys/main.bicep (100%) rename modules/{Microsoft.KeyVault => KeyVault}/vaults/keys/version.json (100%) rename modules/{Microsoft.KeyVault => KeyVault}/vaults/main.bicep (100%) rename modules/{Microsoft.KeyVault => KeyVault}/vaults/secrets/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.KeyVault/vaults/secrets/readme.md => KeyVault/vaults/secrets/README.md} (100%) rename modules/{Microsoft.KeyVault => KeyVault}/vaults/secrets/main.bicep (100%) rename modules/{Microsoft.KeyVault => KeyVault}/vaults/secrets/version.json (100%) rename modules/{Microsoft.KeyVault => KeyVault}/vaults/version.json (100%) rename modules/{Microsoft.KubernetesConfiguration => KubernetesConfiguration}/extensions/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.KubernetesConfiguration => KubernetesConfiguration}/extensions/.test/common/main.test.bicep (100%) rename modules/{Microsoft.KubernetesConfiguration => KubernetesConfiguration}/extensions/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.KubernetesConfiguration => KubernetesConfiguration}/extensions/.test/min/main.test.bicep (100%) rename modules/{Microsoft.KubernetesConfiguration/extensions/readme.md => KubernetesConfiguration/extensions/README.md} (100%) rename modules/{Microsoft.KubernetesConfiguration => KubernetesConfiguration}/extensions/main.bicep (100%) rename modules/{Microsoft.KubernetesConfiguration => KubernetesConfiguration}/extensions/version.json (100%) rename modules/{Microsoft.KubernetesConfiguration => KubernetesConfiguration}/fluxConfigurations/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.KubernetesConfiguration => KubernetesConfiguration}/fluxConfigurations/.test/common/main.test.bicep (100%) rename modules/{Microsoft.KubernetesConfiguration => KubernetesConfiguration}/fluxConfigurations/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.KubernetesConfiguration => KubernetesConfiguration}/fluxConfigurations/.test/min/main.test.bicep (100%) rename modules/{Microsoft.KubernetesConfiguration/fluxConfigurations/readme.md => KubernetesConfiguration/fluxConfigurations/README.md} (100%) rename modules/{Microsoft.KubernetesConfiguration => KubernetesConfiguration}/fluxConfigurations/main.bicep (100%) rename modules/{Microsoft.KubernetesConfiguration => KubernetesConfiguration}/fluxConfigurations/version.json (100%) rename modules/{Microsoft.Logic => Logic}/workflows/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Logic => Logic}/workflows/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Logic => Logic}/workflows/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Logic/workflows/readme.md => Logic/workflows/README.md} (100%) rename modules/{Microsoft.Logic => Logic}/workflows/main.bicep (100%) rename modules/{Microsoft.Logic => Logic}/workflows/version.json (100%) rename modules/{Microsoft.MachineLearningServices => MachineLearningServices}/workspaces/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.MachineLearningServices => MachineLearningServices}/workspaces/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.MachineLearningServices => MachineLearningServices}/workspaces/.test/common/main.test.bicep (100%) rename modules/{Microsoft.MachineLearningServices => MachineLearningServices}/workspaces/.test/encr/dependencies.bicep (100%) rename modules/{Microsoft.MachineLearningServices => MachineLearningServices}/workspaces/.test/encr/main.test.bicep (100%) rename modules/{Microsoft.MachineLearningServices => MachineLearningServices}/workspaces/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.MachineLearningServices => MachineLearningServices}/workspaces/.test/min/main.test.bicep (100%) rename modules/{Microsoft.MachineLearningServices/workspaces/readme.md => MachineLearningServices/workspaces/README.md} (100%) rename modules/{Microsoft.MachineLearningServices/workspaces/computes/readme.md => MachineLearningServices/workspaces/computes/README.md} (100%) rename modules/{Microsoft.MachineLearningServices => MachineLearningServices}/workspaces/computes/main.bicep (100%) rename modules/{Microsoft.MachineLearningServices => MachineLearningServices}/workspaces/computes/version.json (100%) rename modules/{Microsoft.MachineLearningServices => MachineLearningServices}/workspaces/main.bicep (100%) rename modules/{Microsoft.MachineLearningServices => MachineLearningServices}/workspaces/version.json (100%) rename modules/{Microsoft.Maintenance => Maintenance}/maintenanceConfigurations/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Maintenance => Maintenance}/maintenanceConfigurations/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Maintenance => Maintenance}/maintenanceConfigurations/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Maintenance => Maintenance}/maintenanceConfigurations/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Maintenance/maintenanceConfigurations/readme.md => Maintenance/maintenanceConfigurations/README.md} (100%) rename modules/{Microsoft.Maintenance => Maintenance}/maintenanceConfigurations/main.bicep (100%) rename modules/{Microsoft.Maintenance => Maintenance}/maintenanceConfigurations/version.json (100%) rename modules/{Microsoft.ManagedIdentity => ManagedIdentity}/userAssignedIdentities/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.ManagedIdentity => ManagedIdentity}/userAssignedIdentities/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.ManagedIdentity => ManagedIdentity}/userAssignedIdentities/.test/common/main.test.bicep (100%) rename modules/{Microsoft.ManagedIdentity/userAssignedIdentities/readme.md => ManagedIdentity/userAssignedIdentities/README.md} (100%) rename modules/{Microsoft.ManagedIdentity => ManagedIdentity}/userAssignedIdentities/main.bicep (100%) rename modules/{Microsoft.ManagedIdentity => ManagedIdentity}/userAssignedIdentities/version.json (100%) rename modules/{Microsoft.ManagedServices => ManagedServices}/registrationDefinitions/.bicep/nested_registrationAssignment.bicep (100%) rename modules/{Microsoft.ManagedServices => ManagedServices}/registrationDefinitions/.test/common/main.test.bicep (100%) rename modules/{Microsoft.ManagedServices => ManagedServices}/registrationDefinitions/.test/rg/main.test.bicep (100%) rename modules/{Microsoft.ManagedServices/registrationDefinitions/readme.md => ManagedServices/registrationDefinitions/README.md} (100%) rename modules/{Microsoft.ManagedServices => ManagedServices}/registrationDefinitions/main.bicep (100%) rename modules/{Microsoft.ManagedServices => ManagedServices}/registrationDefinitions/version.json (100%) rename modules/{Microsoft.Management => Management}/managementGroups/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Management => Management}/managementGroups/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Management/managementGroups/readme.md => Management/managementGroups/README.md} (100%) rename modules/{Microsoft.Management => Management}/managementGroups/main.bicep (100%) rename modules/{Microsoft.Management => Management}/managementGroups/version.json (100%) rename modules/{Microsoft.NetApp => NetApp}/netAppAccounts/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.NetApp => NetApp}/netAppAccounts/.test/min/main.test.bicep (100%) rename modules/{Microsoft.NetApp => NetApp}/netAppAccounts/.test/nfs3/dependencies.bicep (100%) rename modules/{Microsoft.NetApp => NetApp}/netAppAccounts/.test/nfs3/main.test.bicep (100%) rename modules/{Microsoft.NetApp => NetApp}/netAppAccounts/.test/nfs41/dependencies.bicep (100%) rename modules/{Microsoft.NetApp => NetApp}/netAppAccounts/.test/nfs41/main.test.bicep (100%) rename modules/{Microsoft.NetApp/netAppAccounts/readme.md => NetApp/netAppAccounts/README.md} (100%) rename modules/{Microsoft.NetApp => NetApp}/netAppAccounts/capacityPools/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.NetApp/netAppAccounts/capacityPools/readme.md => NetApp/netAppAccounts/capacityPools/README.md} (100%) rename modules/{Microsoft.NetApp => NetApp}/netAppAccounts/capacityPools/main.bicep (100%) rename modules/{Microsoft.NetApp => NetApp}/netAppAccounts/capacityPools/version.json (100%) rename modules/{Microsoft.NetApp => NetApp}/netAppAccounts/capacityPools/volumes/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md => NetApp/netAppAccounts/capacityPools/volumes/README.md} (100%) rename modules/{Microsoft.NetApp => NetApp}/netAppAccounts/capacityPools/volumes/main.bicep (100%) rename modules/{Microsoft.NetApp => NetApp}/netAppAccounts/capacityPools/volumes/version.json (100%) rename modules/{Microsoft.NetApp => NetApp}/netAppAccounts/main.bicep (100%) rename modules/{Microsoft.NetApp => NetApp}/netAppAccounts/version.json (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/.test/adv/dependencies.bicep (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/.test/adv/main.test.bicep (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/.test/common/main.test.bicep (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/.test/min/main.test.bicep (100%) rename modules/{Microsoft.OperationalInsights/workspaces/readme.md => OperationalInsights/workspaces/README.md} (100%) rename modules/{Microsoft.OperationalInsights/workspaces/dataExports/readme.md => OperationalInsights/workspaces/dataExports/README.md} (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/dataExports/main.bicep (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/dataExports/version.json (100%) rename modules/{Microsoft.OperationalInsights/workspaces/dataSources/readme.md => OperationalInsights/workspaces/dataSources/README.md} (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/dataSources/main.bicep (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/dataSources/version.json (100%) rename modules/{Microsoft.OperationalInsights/workspaces/linkedServices/readme.md => OperationalInsights/workspaces/linkedServices/README.md} (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/linkedServices/main.bicep (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/linkedServices/version.json (100%) rename modules/{Microsoft.OperationalInsights/workspaces/linkedStorageAccounts/readme.md => OperationalInsights/workspaces/linkedStorageAccounts/README.md} (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/linkedStorageAccounts/main.bicep (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/linkedStorageAccounts/version.json (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/main.bicep (100%) rename modules/{Microsoft.OperationalInsights/workspaces/savedSearches/readme.md => OperationalInsights/workspaces/savedSearches/README.md} (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/savedSearches/main.bicep (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/savedSearches/version.json (100%) rename modules/{Microsoft.OperationalInsights/workspaces/storageInsightConfigs/readme.md => OperationalInsights/workspaces/storageInsightConfigs/README.md} (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/storageInsightConfigs/main.bicep (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/storageInsightConfigs/version.json (100%) rename modules/{Microsoft.OperationalInsights/workspaces/tables/readme.md => OperationalInsights/workspaces/tables/README.md} (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/tables/main.bicep (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/tables/version.json (100%) rename modules/{Microsoft.OperationalInsights => OperationalInsights}/workspaces/version.json (100%) rename modules/{Microsoft.OperationsManagement => OperationsManagement}/solutions/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.OperationsManagement => OperationsManagement}/solutions/.test/min/main.test.bicep (100%) rename modules/{Microsoft.OperationsManagement => OperationsManagement}/solutions/.test/ms/dependencies.bicep (100%) rename modules/{Microsoft.OperationsManagement => OperationsManagement}/solutions/.test/ms/main.test.bicep (100%) rename modules/{Microsoft.OperationsManagement => OperationsManagement}/solutions/.test/nonms/dependencies.bicep (100%) rename modules/{Microsoft.OperationsManagement => OperationsManagement}/solutions/.test/nonms/main.test.bicep (100%) rename modules/{Microsoft.OperationsManagement/solutions/readme.md => OperationsManagement/solutions/README.md} (100%) rename modules/{Microsoft.OperationsManagement => OperationsManagement}/solutions/main.bicep (100%) rename modules/{Microsoft.OperationsManagement => OperationsManagement}/solutions/version.json (100%) rename modules/{Microsoft.PolicyInsights => PolicyInsights}/remediations/.test/mg.common/main.test.bicep (100%) rename modules/{Microsoft.PolicyInsights => PolicyInsights}/remediations/.test/mg.min/main.test.bicep (100%) rename modules/{Microsoft.PolicyInsights => PolicyInsights}/remediations/.test/rg.common/main.test.bicep (100%) rename modules/{Microsoft.PolicyInsights => PolicyInsights}/remediations/.test/rg.min/main.test.bicep (100%) rename modules/{Microsoft.PolicyInsights => PolicyInsights}/remediations/.test/sub.common/main.test.bicep (100%) rename modules/{Microsoft.PolicyInsights => PolicyInsights}/remediations/.test/sub.min/main.test.bicep (100%) rename modules/{Microsoft.PolicyInsights/remediations/readme.md => PolicyInsights/remediations/README.md} (100%) rename modules/{Microsoft.PolicyInsights => PolicyInsights}/remediations/main.bicep (100%) rename modules/{Microsoft.PolicyInsights/remediations/managementGroup/readme.md => PolicyInsights/remediations/managementGroup/README.md} (100%) rename modules/{Microsoft.PolicyInsights => PolicyInsights}/remediations/managementGroup/main.bicep (100%) rename modules/{Microsoft.PolicyInsights => PolicyInsights}/remediations/managementGroup/version.json (100%) rename modules/{Microsoft.PolicyInsights/remediations/resourceGroup/readme.md => PolicyInsights/remediations/resourceGroup/README.md} (100%) rename modules/{Microsoft.PolicyInsights => PolicyInsights}/remediations/resourceGroup/main.bicep (100%) rename modules/{Microsoft.PolicyInsights => PolicyInsights}/remediations/resourceGroup/version.json (100%) rename modules/{Microsoft.PolicyInsights/remediations/subscription/readme.md => PolicyInsights/remediations/subscription/README.md} (100%) rename modules/{Microsoft.PolicyInsights => PolicyInsights}/remediations/subscription/main.bicep (100%) rename modules/{Microsoft.PolicyInsights => PolicyInsights}/remediations/subscription/version.json (100%) rename modules/{Microsoft.PolicyInsights => PolicyInsights}/remediations/version.json (100%) rename modules/{Microsoft.PowerBIDedicated => PowerBIDedicated}/capacities/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.PowerBIDedicated => PowerBIDedicated}/capacities/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.PowerBIDedicated => PowerBIDedicated}/capacities/.test/common/main.test.bicep (100%) rename modules/{Microsoft.PowerBIDedicated => PowerBIDedicated}/capacities/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.PowerBIDedicated => PowerBIDedicated}/capacities/.test/min/main.test.bicep (100%) rename modules/{Microsoft.PowerBIDedicated/capacities/readme.md => PowerBIDedicated/capacities/README.md} (100%) rename modules/{Microsoft.PowerBIDedicated => PowerBIDedicated}/capacities/main.bicep (100%) rename modules/{Microsoft.PowerBIDedicated => PowerBIDedicated}/capacities/version.json (100%) rename modules/{Microsoft.Purview => Purview}/accounts/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Purview => Purview}/accounts/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Purview => Purview}/accounts/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Purview => Purview}/accounts/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Purview/accounts/readme.md => Purview/accounts/README.md} (100%) rename modules/{Microsoft.Purview => Purview}/accounts/main.bicep (100%) rename modules/{Microsoft.Purview => Purview}/accounts/version.json (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/.test/common/main.test.bicep (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/.test/dr/main.test.bicep (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/.test/min/main.test.bicep (100%) rename modules/{Microsoft.RecoveryServices/vaults/readme.md => RecoveryServices/vaults/README.md} (100%) rename modules/{Microsoft.RecoveryServices/vaults/backupConfig/readme.md => RecoveryServices/vaults/backupConfig/README.md} (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/backupConfig/main.bicep (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/backupConfig/version.json (100%) rename modules/{Microsoft.RecoveryServices/vaults/backupPolicies/readme.md => RecoveryServices/vaults/backupPolicies/README.md} (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/backupPolicies/main.bicep (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/backupPolicies/version.json (100%) rename modules/{Microsoft.RecoveryServices/vaults/backupStorageConfig/readme.md => RecoveryServices/vaults/backupStorageConfig/README.md} (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/backupStorageConfig/main.bicep (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/backupStorageConfig/version.json (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/main.bicep (100%) rename modules/{Microsoft.RecoveryServices/vaults/protectionContainers/readme.md => RecoveryServices/vaults/protectionContainers/README.md} (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/protectionContainers/main.bicep (100%) rename modules/{Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/readme.md => RecoveryServices/vaults/protectionContainers/protectedItems/README.md} (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/protectionContainers/protectedItems/main.bicep (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/protectionContainers/protectedItems/version.json (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/protectionContainers/version.json (100%) rename modules/{Microsoft.RecoveryServices/vaults/replicationAlertSettings/readme.md => RecoveryServices/vaults/replicationAlertSettings/README.md} (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/replicationAlertSettings/main.bicep (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/replicationAlertSettings/version.json (100%) rename modules/{Microsoft.RecoveryServices/vaults/replicationFabrics/readme.md => RecoveryServices/vaults/replicationFabrics/README.md} (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/replicationFabrics/main.bicep (100%) rename modules/{Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/readme.md => RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/README.md} (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/replicationFabrics/replicationProtectionContainers/main.bicep (100%) rename modules/{Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/readme.md => RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/README.md} (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/main.bicep (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/version.json (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/replicationFabrics/replicationProtectionContainers/version.json (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/replicationFabrics/version.json (100%) rename modules/{Microsoft.RecoveryServices/vaults/replicationPolicies/readme.md => RecoveryServices/vaults/replicationPolicies/README.md} (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/replicationPolicies/main.bicep (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/replicationPolicies/version.json (100%) rename modules/{Microsoft.RecoveryServices => RecoveryServices}/vaults/version.json (100%) rename modules/{Microsoft.Resources => Resources}/deploymentScripts/.test/cli/dependencies.bicep (100%) rename modules/{Microsoft.Resources => Resources}/deploymentScripts/.test/cli/main.test.bicep (100%) rename modules/{Microsoft.Resources => Resources}/deploymentScripts/.test/ps/dependencies.bicep (100%) rename modules/{Microsoft.Resources => Resources}/deploymentScripts/.test/ps/main.test.bicep (100%) rename modules/{Microsoft.Resources/deploymentScripts/readme.md => Resources/deploymentScripts/README.md} (100%) rename modules/{Microsoft.Resources => Resources}/deploymentScripts/main.bicep (100%) rename modules/{Microsoft.Resources => Resources}/deploymentScripts/version.json (100%) rename modules/{Microsoft.Resources => Resources}/resourceGroups/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Resources => Resources}/resourceGroups/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Resources => Resources}/resourceGroups/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Resources => Resources}/resourceGroups/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Resources/resourceGroups/readme.md => Resources/resourceGroups/README.md} (100%) rename modules/{Microsoft.Resources => Resources}/resourceGroups/main.bicep (100%) rename modules/{Microsoft.Resources => Resources}/resourceGroups/version.json (100%) rename modules/{Microsoft.Resources => Resources}/tags/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Resources => Resources}/tags/.test/rg/main.test.bicep (100%) rename modules/{Microsoft.Resources => Resources}/tags/.test/sub/main.test.bicep (100%) rename modules/{Microsoft.Resources/tags/readme.md => Resources/tags/README.md} (100%) rename modules/{Microsoft.Resources => Resources}/tags/main.bicep (100%) rename modules/{Microsoft.Resources => Resources}/tags/resourceGroups/.bicep/readTags.bicep (100%) rename modules/{Microsoft.Resources/tags/resourceGroups/readme.md => Resources/tags/resourceGroups/README.md} (100%) rename modules/{Microsoft.Resources => Resources}/tags/resourceGroups/main.bicep (100%) rename modules/{Microsoft.Resources => Resources}/tags/resourceGroups/version.json (100%) rename modules/{Microsoft.Resources => Resources}/tags/subscriptions/.bicep/readTags.bicep (100%) rename modules/{Microsoft.Resources/tags/subscriptions/readme.md => Resources/tags/subscriptions/README.md} (100%) rename modules/{Microsoft.Resources => Resources}/tags/subscriptions/main.bicep (100%) rename modules/{Microsoft.Resources => Resources}/tags/subscriptions/version.json (100%) rename modules/{Microsoft.Resources => Resources}/tags/version.json (100%) rename modules/{Microsoft.Security => Security}/azureSecurityCenter/.bicep/nested_iotSecuritySolutions.bicep (100%) rename modules/{Microsoft.Security => Security}/azureSecurityCenter/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Security => Security}/azureSecurityCenter/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Security/azureSecurityCenter/readme.md => Security/azureSecurityCenter/README.md} (100%) rename modules/{Microsoft.Security => Security}/azureSecurityCenter/main.bicep (100%) rename modules/{Microsoft.Security => Security}/azureSecurityCenter/version.json (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/.test/common/main.test.bicep (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/.test/encr/dependencies.bicep (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/.test/encr/main.test.bicep (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/.test/min/main.test.bicep (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/.test/pe/dependencies.bicep (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/.test/pe/main.test.bicep (100%) rename modules/{Microsoft.ServiceBus/namespaces/readme.md => ServiceBus/namespaces/README.md} (100%) rename modules/{Microsoft.ServiceBus/namespaces/authorizationRules/readme.md => ServiceBus/namespaces/authorizationRules/README.md} (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/authorizationRules/main.bicep (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/authorizationRules/version.json (100%) rename modules/{Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/readme.md => ServiceBus/namespaces/disasterRecoveryConfigs/README.md} (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/disasterRecoveryConfigs/main.bicep (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/disasterRecoveryConfigs/version.json (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/main.bicep (100%) rename modules/{Microsoft.ServiceBus/namespaces/migrationConfigurations/readme.md => ServiceBus/namespaces/migrationConfigurations/README.md} (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/migrationConfigurations/main.bicep (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/migrationConfigurations/version.json (100%) rename modules/{Microsoft.ServiceBus/namespaces/networkRuleSets/readme.md => ServiceBus/namespaces/networkRuleSets/README.md} (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/networkRuleSets/main.bicep (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/networkRuleSets/version.json (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/queues/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.ServiceBus/namespaces/queues/readme.md => ServiceBus/namespaces/queues/README.md} (100%) rename modules/{Microsoft.ServiceBus/namespaces/queues/authorizationRules/readme.md => ServiceBus/namespaces/queues/authorizationRules/README.md} (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/queues/authorizationRules/main.bicep (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/queues/authorizationRules/version.json (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/queues/main.bicep (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/queues/version.json (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/topics/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.ServiceBus/namespaces/topics/readme.md => ServiceBus/namespaces/topics/README.md} (100%) rename modules/{Microsoft.ServiceBus/namespaces/topics/authorizationRules/readme.md => ServiceBus/namespaces/topics/authorizationRules/README.md} (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/topics/authorizationRules/main.bicep (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/topics/authorizationRules/version.json (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/topics/main.bicep (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/topics/version.json (100%) rename modules/{Microsoft.ServiceBus => ServiceBus}/namespaces/version.json (100%) rename modules/{Microsoft.ServiceFabric => ServiceFabric}/clusters/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.ServiceFabric => ServiceFabric}/clusters/.test/cert/main.test.bicep (100%) rename modules/{Microsoft.ServiceFabric => ServiceFabric}/clusters/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.ServiceFabric => ServiceFabric}/clusters/.test/common/main.test.bicep (100%) rename modules/{Microsoft.ServiceFabric => ServiceFabric}/clusters/.test/min/main.test.bicep (100%) rename modules/{Microsoft.ServiceFabric/clusters/readme.md => ServiceFabric/clusters/README.md} (100%) rename modules/{Microsoft.ServiceFabric/clusters/applicationTypes/readme.md => ServiceFabric/clusters/applicationTypes/README.md} (100%) rename modules/{Microsoft.ServiceFabric => ServiceFabric}/clusters/applicationTypes/main.bicep (100%) rename modules/{Microsoft.ServiceFabric => ServiceFabric}/clusters/applicationTypes/version.json (100%) rename modules/{Microsoft.ServiceFabric => ServiceFabric}/clusters/main.bicep (100%) rename modules/{Microsoft.ServiceFabric => ServiceFabric}/clusters/version.json (100%) rename modules/{Microsoft.SignalRService => SignalRService}/signalR/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.SignalRService => SignalRService}/signalR/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.SignalRService => SignalRService}/signalR/.test/common/main.test.bicep (100%) rename modules/{Microsoft.SignalRService => SignalRService}/signalR/.test/min/main.test.bicep (100%) rename modules/{Microsoft.SignalRService/signalR/readme.md => SignalRService/signalR/README.md} (100%) rename modules/{Microsoft.SignalRService => SignalRService}/signalR/main.bicep (100%) rename modules/{Microsoft.SignalRService => SignalRService}/signalR/version.json (100%) rename modules/{Microsoft.SignalRService => SignalRService}/webPubSub/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.SignalRService => SignalRService}/webPubSub/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.SignalRService => SignalRService}/webPubSub/.test/common/main.test.bicep (100%) rename modules/{Microsoft.SignalRService => SignalRService}/webPubSub/.test/min/main.test.bicep (100%) rename modules/{Microsoft.SignalRService => SignalRService}/webPubSub/.test/pe/dependencies.bicep (100%) rename modules/{Microsoft.SignalRService => SignalRService}/webPubSub/.test/pe/main.test.bicep (100%) rename modules/{Microsoft.SignalRService/webPubSub/readme.md => SignalRService/webPubSub/README.md} (100%) rename modules/{Microsoft.SignalRService => SignalRService}/webPubSub/main.bicep (100%) rename modules/{Microsoft.SignalRService => SignalRService}/webPubSub/version.json (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Sql/managedInstances/readme.md => Sql/managedInstances/README.md} (100%) rename modules/{Microsoft.Sql/managedInstances/administrators/readme.md => Sql/managedInstances/administrators/README.md} (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/administrators/main.bicep (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/administrators/version.json (100%) rename modules/{Microsoft.Sql/managedInstances/databases/readme.md => Sql/managedInstances/databases/README.md} (100%) rename modules/{Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/readme.md => Sql/managedInstances/databases/backupLongTermRetentionPolicies/README.md} (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/databases/backupLongTermRetentionPolicies/main.bicep (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/databases/backupLongTermRetentionPolicies/version.json (100%) rename modules/{Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/readme.md => Sql/managedInstances/databases/backupShortTermRetentionPolicies/README.md} (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/databases/backupShortTermRetentionPolicies/main.bicep (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/databases/backupShortTermRetentionPolicies/version.json (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/databases/main.bicep (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/databases/version.json (100%) rename modules/{Microsoft.Sql/managedInstances/encryptionProtector/readme.md => Sql/managedInstances/encryptionProtector/README.md} (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/encryptionProtector/main.bicep (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/encryptionProtector/version.json (100%) rename modules/{Microsoft.Sql/managedInstances/keys/readme.md => Sql/managedInstances/keys/README.md} (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/keys/main.bicep (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/keys/version.json (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/main.bicep (100%) rename modules/{Microsoft.Sql/managedInstances/securityAlertPolicies/readme.md => Sql/managedInstances/securityAlertPolicies/README.md} (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/securityAlertPolicies/main.bicep (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/securityAlertPolicies/version.json (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/version.json (100%) rename modules/{Microsoft.Sql/managedInstances/vulnerabilityAssessments/readme.md => Sql/managedInstances/vulnerabilityAssessments/README.md} (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/vulnerabilityAssessments/main.bicep (100%) rename modules/{Microsoft.Sql => Sql}/managedInstances/vulnerabilityAssessments/version.json (100%) rename modules/{Microsoft.Sql => Sql}/servers/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Sql => Sql}/servers/.test/admin/dependencies.bicep (100%) rename modules/{Microsoft.Sql => Sql}/servers/.test/admin/main.test.bicep (100%) rename modules/{Microsoft.Sql => Sql}/servers/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Sql => Sql}/servers/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Sql => Sql}/servers/.test/pe/dependencies.bicep (100%) rename modules/{Microsoft.Sql => Sql}/servers/.test/pe/main.test.bicep (100%) rename modules/{Microsoft.Sql => Sql}/servers/.test/secondary/dependencies.bicep (100%) rename modules/{Microsoft.Sql => Sql}/servers/.test/secondary/main.test.bicep (100%) rename modules/{Microsoft.Sql/servers/readme.md => Sql/servers/README.md} (100%) rename modules/{Microsoft.Sql/servers/databases/readme.md => Sql/servers/databases/README.md} (100%) rename modules/{Microsoft.Sql/servers/databases/backupLongTermRetentionPolicies/readme.md => Sql/servers/databases/backupLongTermRetentionPolicies/README.md} (100%) rename modules/{Microsoft.Sql => Sql}/servers/databases/backupLongTermRetentionPolicies/main.bicep (100%) rename modules/{Microsoft.Sql => Sql}/servers/databases/backupLongTermRetentionPolicies/version.json (100%) rename modules/{Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies/readme.md => Sql/servers/databases/backupShortTermRetentionPolicies/README.md} (100%) rename modules/{Microsoft.Sql => Sql}/servers/databases/backupShortTermRetentionPolicies/main.bicep (100%) rename modules/{Microsoft.Sql => Sql}/servers/databases/backupShortTermRetentionPolicies/version.json (100%) rename modules/{Microsoft.Sql => Sql}/servers/databases/main.bicep (100%) rename modules/{Microsoft.Sql => Sql}/servers/databases/version.json (100%) rename modules/{Microsoft.Sql/servers/elasticPools/readme.md => Sql/servers/elasticPools/README.md} (100%) rename modules/{Microsoft.Sql => Sql}/servers/elasticPools/main.bicep (100%) rename modules/{Microsoft.Sql => Sql}/servers/elasticPools/version.json (100%) rename modules/{Microsoft.Sql/servers/encryptionProtector/readme.md => Sql/servers/encryptionProtector/README.md} (100%) rename modules/{Microsoft.Sql => Sql}/servers/encryptionProtector/main.bicep (100%) rename modules/{Microsoft.Sql => Sql}/servers/encryptionProtector/version.json (100%) rename modules/{Microsoft.Sql/servers/firewallRules/readme.md => Sql/servers/firewallRules/README.md} (100%) rename modules/{Microsoft.Sql => Sql}/servers/firewallRules/main.bicep (100%) rename modules/{Microsoft.Sql => Sql}/servers/firewallRules/version.json (100%) rename modules/{Microsoft.Sql/servers/keys/readme.md => Sql/servers/keys/README.md} (100%) rename modules/{Microsoft.Sql => Sql}/servers/keys/main.bicep (100%) rename modules/{Microsoft.Sql => Sql}/servers/keys/version.json (100%) rename modules/{Microsoft.Sql => Sql}/servers/main.bicep (100%) rename modules/{Microsoft.Sql/servers/securityAlertPolicies/readme.md => Sql/servers/securityAlertPolicies/README.md} (100%) rename modules/{Microsoft.Sql => Sql}/servers/securityAlertPolicies/main.bicep (100%) rename modules/{Microsoft.Sql => Sql}/servers/securityAlertPolicies/version.json (100%) rename modules/{Microsoft.Sql => Sql}/servers/version.json (100%) rename modules/{Microsoft.Sql/servers/virtualNetworkRules/readme.md => Sql/servers/virtualNetworkRules/README.md} (100%) rename modules/{Microsoft.Sql => Sql}/servers/virtualNetworkRules/main.bicep (100%) rename modules/{Microsoft.Sql => Sql}/servers/virtualNetworkRules/version.json (100%) rename modules/{Microsoft.Sql/servers/vulnerabilityAssessments/readme.md => Sql/servers/vulnerabilityAssessments/README.md} (100%) rename modules/{Microsoft.Sql => Sql}/servers/vulnerabilityAssessments/main.bicep (100%) rename modules/{Microsoft.Sql => Sql}/servers/vulnerabilityAssessments/version.json (100%) rename modules/{Microsoft.Synapse => Synapse}/privateLinkHubs/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Synapse => Synapse}/privateLinkHubs/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Synapse => Synapse}/privateLinkHubs/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Synapse => Synapse}/privateLinkHubs/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Synapse/privateLinkHubs/readme.md => Synapse/privateLinkHubs/README.md} (100%) rename modules/{Microsoft.Synapse => Synapse}/privateLinkHubs/main.bicep (100%) rename modules/{Microsoft.Synapse => Synapse}/privateLinkHubs/version.json (100%) rename modules/{Microsoft.Synapse => Synapse}/workspaces/.bicep/nested_cmkRbac.bicep (100%) rename modules/{Microsoft.Synapse => Synapse}/workspaces/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Synapse => Synapse}/workspaces/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Synapse => Synapse}/workspaces/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Synapse => Synapse}/workspaces/.test/encrwsai/dependencies.bicep (100%) rename modules/{Microsoft.Synapse => Synapse}/workspaces/.test/encrwsai/main.test.bicep (100%) rename modules/{Microsoft.Synapse => Synapse}/workspaces/.test/encrwuai/dependencies.bicep (100%) rename modules/{Microsoft.Synapse => Synapse}/workspaces/.test/encrwuai/main.test.bicep (100%) rename modules/{Microsoft.Synapse => Synapse}/workspaces/.test/managedvnet/dependencies.bicep (100%) rename modules/{Microsoft.Synapse => Synapse}/workspaces/.test/managedvnet/main.test.bicep (100%) rename modules/{Microsoft.Synapse => Synapse}/workspaces/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.Synapse => Synapse}/workspaces/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Synapse/workspaces/readme.md => Synapse/workspaces/README.md} (100%) rename modules/{Microsoft.Synapse/workspaces/keys/readme.md => Synapse/workspaces/keys/README.md} (100%) rename modules/{Microsoft.Synapse => Synapse}/workspaces/keys/main.bicep (100%) rename modules/{Microsoft.Synapse => Synapse}/workspaces/keys/version.json (100%) rename modules/{Microsoft.Synapse => Synapse}/workspaces/main.bicep (100%) rename modules/{Microsoft.Synapse => Synapse}/workspaces/version.json (100%) rename modules/{Microsoft.VirtualMachineImages => VirtualMachineImages}/imageTemplates/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.VirtualMachineImages => VirtualMachineImages}/imageTemplates/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.VirtualMachineImages => VirtualMachineImages}/imageTemplates/.test/common/main.test.bicep (100%) rename modules/{Microsoft.VirtualMachineImages => VirtualMachineImages}/imageTemplates/.test/min/dependencies.bicep (100%) rename modules/{Microsoft.VirtualMachineImages => VirtualMachineImages}/imageTemplates/.test/min/main.test.bicep (100%) rename modules/{Microsoft.VirtualMachineImages/imageTemplates/readme.md => VirtualMachineImages/imageTemplates/README.md} (100%) rename modules/{Microsoft.VirtualMachineImages => VirtualMachineImages}/imageTemplates/main.bicep (100%) rename modules/{Microsoft.VirtualMachineImages => VirtualMachineImages}/imageTemplates/version.json (100%) rename modules/{Microsoft.Web => Web}/connections/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Web => Web}/connections/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Web => Web}/connections/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Web/connections/readme.md => Web/connections/README.md} (100%) rename modules/{Microsoft.Web => Web}/connections/main.bicep (100%) rename modules/{Microsoft.Web => Web}/connections/version.json (100%) rename modules/{Microsoft.Web => Web}/hostingEnvironments/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Web => Web}/hostingEnvironments/.test/asev2/dependencies.bicep (100%) rename modules/{Microsoft.Web => Web}/hostingEnvironments/.test/asev2/main.test.bicep (100%) rename modules/{Microsoft.Web => Web}/hostingEnvironments/.test/asev3/dependencies.bicep (100%) rename modules/{Microsoft.Web => Web}/hostingEnvironments/.test/asev3/main.test.bicep (100%) rename modules/{Microsoft.Web/hostingEnvironments/readme.md => Web/hostingEnvironments/README.md} (100%) rename modules/{Microsoft.Web/hostingEnvironments/configurations-customdnssuffix/readme.md => Web/hostingEnvironments/configurations-customdnssuffix/README.md} (100%) rename modules/{Microsoft.Web => Web}/hostingEnvironments/configurations-customdnssuffix/main.bicep (100%) rename modules/{Microsoft.Web => Web}/hostingEnvironments/configurations-customdnssuffix/version.json (100%) rename modules/{Microsoft.Web/hostingEnvironments/configurations-networking/readme.md => Web/hostingEnvironments/configurations-networking/README.md} (100%) rename modules/{Microsoft.Web => Web}/hostingEnvironments/configurations-networking/main.bicep (100%) rename modules/{Microsoft.Web => Web}/hostingEnvironments/configurations-networking/version.json (100%) rename modules/{Microsoft.Web => Web}/hostingEnvironments/main.bicep (100%) rename modules/{Microsoft.Web => Web}/hostingEnvironments/version.json (100%) rename modules/{Microsoft.Web => Web}/serverfarms/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Web => Web}/serverfarms/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Web => Web}/serverfarms/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Web/serverfarms/readme.md => Web/serverfarms/README.md} (100%) rename modules/{Microsoft.Web => Web}/serverfarms/main.bicep (100%) rename modules/{Microsoft.Web => Web}/serverfarms/version.json (100%) rename modules/{Microsoft.Web => Web}/sites/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Web => Web}/sites/.test/functionAppCommon/dependencies.bicep (100%) rename modules/{Microsoft.Web => Web}/sites/.test/functionAppCommon/main.test.bicep (100%) rename modules/{Microsoft.Web => Web}/sites/.test/functionAppMin/dependencies.bicep (100%) rename modules/{Microsoft.Web => Web}/sites/.test/functionAppMin/main.test.bicep (100%) rename modules/{Microsoft.Web => Web}/sites/.test/webAppCommon/dependencies.bicep (100%) rename modules/{Microsoft.Web => Web}/sites/.test/webAppCommon/main.test.bicep (100%) rename modules/{Microsoft.Web => Web}/sites/.test/webAppMin/dependencies.bicep (100%) rename modules/{Microsoft.Web => Web}/sites/.test/webAppMin/main.test.bicep (100%) rename modules/{Microsoft.Web/sites/readme.md => Web/sites/README.md} (100%) rename modules/{Microsoft.Web/sites/basicPublishingCredentialsPolicies/readme.md => Web/sites/basicPublishingCredentialsPolicies/README.md} (100%) rename modules/{Microsoft.Web => Web}/sites/basicPublishingCredentialsPolicies/main.bicep (100%) rename modules/{Microsoft.Web => Web}/sites/basicPublishingCredentialsPolicies/version.json (100%) rename modules/{Microsoft.Web/sites/config-appsettings/readme.md => Web/sites/config-appsettings/README.md} (100%) rename modules/{Microsoft.Web => Web}/sites/config-appsettings/main.bicep (100%) rename modules/{Microsoft.Web => Web}/sites/config-appsettings/version.json (100%) rename modules/{Microsoft.Web/sites/config-authsettingsv2/readme.md => Web/sites/config-authsettingsv2/README.md} (100%) rename modules/{Microsoft.Web => Web}/sites/config-authsettingsv2/main.bicep (100%) rename modules/{Microsoft.Web => Web}/sites/config-authsettingsv2/version.json (100%) rename modules/{Microsoft.Web => Web}/sites/main.bicep (100%) rename modules/{Microsoft.Web => Web}/sites/slots/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Web/sites/slots/readme.md => Web/sites/slots/README.md} (100%) rename modules/{Microsoft.Web/sites/slots/config-appsettings/readme.md => Web/sites/slots/config-appsettings/README.md} (100%) rename modules/{Microsoft.Web => Web}/sites/slots/config-appsettings/main.bicep (100%) rename modules/{Microsoft.Web => Web}/sites/slots/config-appsettings/version.json (100%) rename modules/{Microsoft.Web/sites/slots/config-authsettingsv2/readme.md => Web/sites/slots/config-authsettingsv2/README.md} (100%) rename modules/{Microsoft.Web => Web}/sites/slots/config-authsettingsv2/main.bicep (100%) rename modules/{Microsoft.Web => Web}/sites/slots/config-authsettingsv2/version.json (100%) rename modules/{Microsoft.Web => Web}/sites/slots/main.bicep (100%) rename modules/{Microsoft.Web => Web}/sites/slots/version.json (100%) rename modules/{Microsoft.Web => Web}/sites/version.json (100%) rename modules/{Microsoft.Web => Web}/staticSites/.bicep/nested_roleAssignments.bicep (100%) rename modules/{Microsoft.Web => Web}/staticSites/.test/common/dependencies.bicep (100%) rename modules/{Microsoft.Web => Web}/staticSites/.test/common/main.test.bicep (100%) rename modules/{Microsoft.Web => Web}/staticSites/.test/min/main.test.bicep (100%) rename modules/{Microsoft.Web/staticSites/readme.md => Web/staticSites/README.md} (100%) rename modules/{Microsoft.Web/staticSites/config/readme.md => Web/staticSites/config/README.md} (100%) rename modules/{Microsoft.Web => Web}/staticSites/config/main.bicep (100%) rename modules/{Microsoft.Web => Web}/staticSites/config/version.json (100%) rename modules/{Microsoft.Web/staticSites/customDomains/readme.md => Web/staticSites/customDomains/README.md} (100%) rename modules/{Microsoft.Web => Web}/staticSites/customDomains/main.bicep (100%) rename modules/{Microsoft.Web => Web}/staticSites/customDomains/version.json (100%) rename modules/{Microsoft.Web/staticSites/linkedBackends/readme.md => Web/staticSites/linkedBackends/README.md} (100%) rename modules/{Microsoft.Web => Web}/staticSites/linkedBackends/main.bicep (100%) rename modules/{Microsoft.Web => Web}/staticSites/linkedBackends/version.json (100%) rename modules/{Microsoft.Web => Web}/staticSites/main.bicep (100%) rename modules/{Microsoft.Web => Web}/staticSites/version.json (100%) diff --git a/modules/Microsoft.AAD/DomainServices/.bicep/nested_roleAssignments.bicep b/modules/AAD/DomainServices/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.AAD/DomainServices/.bicep/nested_roleAssignments.bicep rename to modules/AAD/DomainServices/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.AAD/DomainServices/.test/common/dependencies.bicep b/modules/AAD/DomainServices/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.AAD/DomainServices/.test/common/dependencies.bicep rename to modules/AAD/DomainServices/.test/common/dependencies.bicep diff --git a/modules/Microsoft.AAD/DomainServices/.test/common/main.test.bicep b/modules/AAD/DomainServices/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.AAD/DomainServices/.test/common/main.test.bicep rename to modules/AAD/DomainServices/.test/common/main.test.bicep diff --git a/modules/Microsoft.AAD/DomainServices/readme.md b/modules/AAD/DomainServices/README.md similarity index 100% rename from modules/Microsoft.AAD/DomainServices/readme.md rename to modules/AAD/DomainServices/README.md diff --git a/modules/Microsoft.AAD/DomainServices/main.bicep b/modules/AAD/DomainServices/main.bicep similarity index 100% rename from modules/Microsoft.AAD/DomainServices/main.bicep rename to modules/AAD/DomainServices/main.bicep diff --git a/modules/Microsoft.AAD/DomainServices/version.json b/modules/AAD/DomainServices/version.json similarity index 100% rename from modules/Microsoft.AAD/DomainServices/version.json rename to modules/AAD/DomainServices/version.json diff --git a/modules/Microsoft.AnalysisServices/servers/.bicep/nested_roleAssignments.bicep b/modules/AnalysisServices/servers/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.AnalysisServices/servers/.bicep/nested_roleAssignments.bicep rename to modules/AnalysisServices/servers/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.AnalysisServices/servers/.test/common/dependencies.bicep b/modules/AnalysisServices/servers/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.AnalysisServices/servers/.test/common/dependencies.bicep rename to modules/AnalysisServices/servers/.test/common/dependencies.bicep diff --git a/modules/Microsoft.AnalysisServices/servers/.test/common/main.test.bicep b/modules/AnalysisServices/servers/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.AnalysisServices/servers/.test/common/main.test.bicep rename to modules/AnalysisServices/servers/.test/common/main.test.bicep diff --git a/modules/Microsoft.AnalysisServices/servers/.test/max/dependencies.bicep b/modules/AnalysisServices/servers/.test/max/dependencies.bicep similarity index 100% rename from modules/Microsoft.AnalysisServices/servers/.test/max/dependencies.bicep rename to modules/AnalysisServices/servers/.test/max/dependencies.bicep diff --git a/modules/Microsoft.AnalysisServices/servers/.test/max/main.test.bicep b/modules/AnalysisServices/servers/.test/max/main.test.bicep similarity index 100% rename from modules/Microsoft.AnalysisServices/servers/.test/max/main.test.bicep rename to modules/AnalysisServices/servers/.test/max/main.test.bicep diff --git a/modules/Microsoft.AnalysisServices/servers/.test/min/main.test.bicep b/modules/AnalysisServices/servers/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.AnalysisServices/servers/.test/min/main.test.bicep rename to modules/AnalysisServices/servers/.test/min/main.test.bicep diff --git a/modules/Microsoft.AnalysisServices/servers/readme.md b/modules/AnalysisServices/servers/README.md similarity index 100% rename from modules/Microsoft.AnalysisServices/servers/readme.md rename to modules/AnalysisServices/servers/README.md diff --git a/modules/Microsoft.AnalysisServices/servers/main.bicep b/modules/AnalysisServices/servers/main.bicep similarity index 100% rename from modules/Microsoft.AnalysisServices/servers/main.bicep rename to modules/AnalysisServices/servers/main.bicep diff --git a/modules/Microsoft.AnalysisServices/servers/version.json b/modules/AnalysisServices/servers/version.json similarity index 100% rename from modules/Microsoft.AnalysisServices/servers/version.json rename to modules/AnalysisServices/servers/version.json diff --git a/modules/Microsoft.ApiManagement/service/.bicep/nested_roleAssignments.bicep b/modules/ApiManagement/service/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.ApiManagement/service/.bicep/nested_roleAssignments.bicep rename to modules/ApiManagement/service/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.ApiManagement/service/.test/common/dependencies.bicep b/modules/ApiManagement/service/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.ApiManagement/service/.test/common/dependencies.bicep rename to modules/ApiManagement/service/.test/common/dependencies.bicep diff --git a/modules/Microsoft.ApiManagement/service/.test/common/main.test.bicep b/modules/ApiManagement/service/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.ApiManagement/service/.test/common/main.test.bicep rename to modules/ApiManagement/service/.test/common/main.test.bicep diff --git a/modules/Microsoft.ApiManagement/service/.test/max/dependencies.bicep b/modules/ApiManagement/service/.test/max/dependencies.bicep similarity index 100% rename from modules/Microsoft.ApiManagement/service/.test/max/dependencies.bicep rename to modules/ApiManagement/service/.test/max/dependencies.bicep diff --git a/modules/Microsoft.ApiManagement/service/.test/max/main.test.bicep b/modules/ApiManagement/service/.test/max/main.test.bicep similarity index 100% rename from modules/Microsoft.ApiManagement/service/.test/max/main.test.bicep rename to modules/ApiManagement/service/.test/max/main.test.bicep diff --git a/modules/Microsoft.ApiManagement/service/.test/min/main.test.bicep b/modules/ApiManagement/service/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.ApiManagement/service/.test/min/main.test.bicep rename to modules/ApiManagement/service/.test/min/main.test.bicep diff --git a/modules/Microsoft.ApiManagement/service/readme.md b/modules/ApiManagement/service/README.md similarity index 100% rename from modules/Microsoft.ApiManagement/service/readme.md rename to modules/ApiManagement/service/README.md diff --git a/modules/Microsoft.ApiManagement/service/apiVersionSets/readme.md b/modules/ApiManagement/service/apiVersionSets/README.md similarity index 100% rename from modules/Microsoft.ApiManagement/service/apiVersionSets/readme.md rename to modules/ApiManagement/service/apiVersionSets/README.md diff --git a/modules/Microsoft.ApiManagement/service/apiVersionSets/main.bicep b/modules/ApiManagement/service/apiVersionSets/main.bicep similarity index 100% rename from modules/Microsoft.ApiManagement/service/apiVersionSets/main.bicep rename to modules/ApiManagement/service/apiVersionSets/main.bicep diff --git a/modules/Microsoft.ApiManagement/service/apiVersionSets/version.json b/modules/ApiManagement/service/apiVersionSets/version.json similarity index 100% rename from modules/Microsoft.ApiManagement/service/apiVersionSets/version.json rename to modules/ApiManagement/service/apiVersionSets/version.json diff --git a/modules/Microsoft.ApiManagement/service/apis/readme.md b/modules/ApiManagement/service/apis/README.md similarity index 100% rename from modules/Microsoft.ApiManagement/service/apis/readme.md rename to modules/ApiManagement/service/apis/README.md diff --git a/modules/Microsoft.ApiManagement/service/apis/main.bicep b/modules/ApiManagement/service/apis/main.bicep similarity index 100% rename from modules/Microsoft.ApiManagement/service/apis/main.bicep rename to modules/ApiManagement/service/apis/main.bicep diff --git a/modules/Microsoft.ApiManagement/service/apis/policies/readme.md b/modules/ApiManagement/service/apis/policies/README.md similarity index 100% rename from modules/Microsoft.ApiManagement/service/apis/policies/readme.md rename to modules/ApiManagement/service/apis/policies/README.md diff --git a/modules/Microsoft.ApiManagement/service/apis/policies/main.bicep b/modules/ApiManagement/service/apis/policies/main.bicep similarity index 100% rename from modules/Microsoft.ApiManagement/service/apis/policies/main.bicep rename to modules/ApiManagement/service/apis/policies/main.bicep diff --git a/modules/Microsoft.ApiManagement/service/apis/policies/version.json b/modules/ApiManagement/service/apis/policies/version.json similarity index 100% rename from modules/Microsoft.ApiManagement/service/apis/policies/version.json rename to modules/ApiManagement/service/apis/policies/version.json diff --git a/modules/Microsoft.ApiManagement/service/apis/version.json b/modules/ApiManagement/service/apis/version.json similarity index 100% rename from modules/Microsoft.ApiManagement/service/apis/version.json rename to modules/ApiManagement/service/apis/version.json diff --git a/modules/Microsoft.ApiManagement/service/authorizationServers/readme.md b/modules/ApiManagement/service/authorizationServers/README.md similarity index 100% rename from modules/Microsoft.ApiManagement/service/authorizationServers/readme.md rename to modules/ApiManagement/service/authorizationServers/README.md diff --git a/modules/Microsoft.ApiManagement/service/authorizationServers/main.bicep b/modules/ApiManagement/service/authorizationServers/main.bicep similarity index 100% rename from modules/Microsoft.ApiManagement/service/authorizationServers/main.bicep rename to modules/ApiManagement/service/authorizationServers/main.bicep diff --git a/modules/Microsoft.ApiManagement/service/authorizationServers/version.json b/modules/ApiManagement/service/authorizationServers/version.json similarity index 100% rename from modules/Microsoft.ApiManagement/service/authorizationServers/version.json rename to modules/ApiManagement/service/authorizationServers/version.json diff --git a/modules/Microsoft.ApiManagement/service/backends/readme.md b/modules/ApiManagement/service/backends/README.md similarity index 100% rename from modules/Microsoft.ApiManagement/service/backends/readme.md rename to modules/ApiManagement/service/backends/README.md diff --git a/modules/Microsoft.ApiManagement/service/backends/main.bicep b/modules/ApiManagement/service/backends/main.bicep similarity index 100% rename from modules/Microsoft.ApiManagement/service/backends/main.bicep rename to modules/ApiManagement/service/backends/main.bicep diff --git a/modules/Microsoft.ApiManagement/service/backends/version.json b/modules/ApiManagement/service/backends/version.json similarity index 100% rename from modules/Microsoft.ApiManagement/service/backends/version.json rename to modules/ApiManagement/service/backends/version.json diff --git a/modules/Microsoft.ApiManagement/service/caches/readme.md b/modules/ApiManagement/service/caches/README.md similarity index 100% rename from modules/Microsoft.ApiManagement/service/caches/readme.md rename to modules/ApiManagement/service/caches/README.md diff --git a/modules/Microsoft.ApiManagement/service/caches/main.bicep b/modules/ApiManagement/service/caches/main.bicep similarity index 100% rename from modules/Microsoft.ApiManagement/service/caches/main.bicep rename to modules/ApiManagement/service/caches/main.bicep diff --git a/modules/Microsoft.ApiManagement/service/caches/version.json b/modules/ApiManagement/service/caches/version.json similarity index 100% rename from modules/Microsoft.ApiManagement/service/caches/version.json rename to modules/ApiManagement/service/caches/version.json diff --git a/modules/Microsoft.ApiManagement/service/identityProviders/readme.md b/modules/ApiManagement/service/identityProviders/README.md similarity index 100% rename from modules/Microsoft.ApiManagement/service/identityProviders/readme.md rename to modules/ApiManagement/service/identityProviders/README.md diff --git a/modules/Microsoft.ApiManagement/service/identityProviders/main.bicep b/modules/ApiManagement/service/identityProviders/main.bicep similarity index 100% rename from modules/Microsoft.ApiManagement/service/identityProviders/main.bicep rename to modules/ApiManagement/service/identityProviders/main.bicep diff --git a/modules/Microsoft.ApiManagement/service/identityProviders/version.json b/modules/ApiManagement/service/identityProviders/version.json similarity index 100% rename from modules/Microsoft.ApiManagement/service/identityProviders/version.json rename to modules/ApiManagement/service/identityProviders/version.json diff --git a/modules/Microsoft.ApiManagement/service/main.bicep b/modules/ApiManagement/service/main.bicep similarity index 100% rename from modules/Microsoft.ApiManagement/service/main.bicep rename to modules/ApiManagement/service/main.bicep diff --git a/modules/Microsoft.ApiManagement/service/namedValues/readme.md b/modules/ApiManagement/service/namedValues/README.md similarity index 100% rename from modules/Microsoft.ApiManagement/service/namedValues/readme.md rename to modules/ApiManagement/service/namedValues/README.md diff --git a/modules/Microsoft.ApiManagement/service/namedValues/main.bicep b/modules/ApiManagement/service/namedValues/main.bicep similarity index 100% rename from modules/Microsoft.ApiManagement/service/namedValues/main.bicep rename to modules/ApiManagement/service/namedValues/main.bicep diff --git a/modules/Microsoft.ApiManagement/service/namedValues/version.json b/modules/ApiManagement/service/namedValues/version.json similarity index 100% rename from modules/Microsoft.ApiManagement/service/namedValues/version.json rename to modules/ApiManagement/service/namedValues/version.json diff --git a/modules/Microsoft.ApiManagement/service/policies/readme.md b/modules/ApiManagement/service/policies/README.md similarity index 100% rename from modules/Microsoft.ApiManagement/service/policies/readme.md rename to modules/ApiManagement/service/policies/README.md diff --git a/modules/Microsoft.ApiManagement/service/policies/main.bicep b/modules/ApiManagement/service/policies/main.bicep similarity index 100% rename from modules/Microsoft.ApiManagement/service/policies/main.bicep rename to modules/ApiManagement/service/policies/main.bicep diff --git a/modules/Microsoft.ApiManagement/service/policies/version.json b/modules/ApiManagement/service/policies/version.json similarity index 100% rename from modules/Microsoft.ApiManagement/service/policies/version.json rename to modules/ApiManagement/service/policies/version.json diff --git a/modules/Microsoft.ApiManagement/service/portalSettings/readme.md b/modules/ApiManagement/service/portalSettings/README.md similarity index 100% rename from modules/Microsoft.ApiManagement/service/portalSettings/readme.md rename to modules/ApiManagement/service/portalSettings/README.md diff --git a/modules/Microsoft.ApiManagement/service/portalSettings/main.bicep b/modules/ApiManagement/service/portalSettings/main.bicep similarity index 100% rename from modules/Microsoft.ApiManagement/service/portalSettings/main.bicep rename to modules/ApiManagement/service/portalSettings/main.bicep diff --git a/modules/Microsoft.ApiManagement/service/portalSettings/version.json b/modules/ApiManagement/service/portalSettings/version.json similarity index 100% rename from modules/Microsoft.ApiManagement/service/portalSettings/version.json rename to modules/ApiManagement/service/portalSettings/version.json diff --git a/modules/Microsoft.ApiManagement/service/products/readme.md b/modules/ApiManagement/service/products/README.md similarity index 100% rename from modules/Microsoft.ApiManagement/service/products/readme.md rename to modules/ApiManagement/service/products/README.md diff --git a/modules/Microsoft.ApiManagement/service/products/apis/readme.md b/modules/ApiManagement/service/products/apis/README.md similarity index 100% rename from modules/Microsoft.ApiManagement/service/products/apis/readme.md rename to modules/ApiManagement/service/products/apis/README.md diff --git a/modules/Microsoft.ApiManagement/service/products/apis/main.bicep b/modules/ApiManagement/service/products/apis/main.bicep similarity index 100% rename from modules/Microsoft.ApiManagement/service/products/apis/main.bicep rename to modules/ApiManagement/service/products/apis/main.bicep diff --git a/modules/Microsoft.ApiManagement/service/products/apis/version.json b/modules/ApiManagement/service/products/apis/version.json similarity index 100% rename from modules/Microsoft.ApiManagement/service/products/apis/version.json rename to modules/ApiManagement/service/products/apis/version.json diff --git a/modules/Microsoft.ApiManagement/service/products/groups/readme.md b/modules/ApiManagement/service/products/groups/README.md similarity index 100% rename from modules/Microsoft.ApiManagement/service/products/groups/readme.md rename to modules/ApiManagement/service/products/groups/README.md diff --git a/modules/Microsoft.ApiManagement/service/products/groups/main.bicep b/modules/ApiManagement/service/products/groups/main.bicep similarity index 100% rename from modules/Microsoft.ApiManagement/service/products/groups/main.bicep rename to modules/ApiManagement/service/products/groups/main.bicep diff --git a/modules/Microsoft.ApiManagement/service/products/groups/version.json b/modules/ApiManagement/service/products/groups/version.json similarity index 100% rename from modules/Microsoft.ApiManagement/service/products/groups/version.json rename to modules/ApiManagement/service/products/groups/version.json diff --git a/modules/Microsoft.ApiManagement/service/products/main.bicep b/modules/ApiManagement/service/products/main.bicep similarity index 100% rename from modules/Microsoft.ApiManagement/service/products/main.bicep rename to modules/ApiManagement/service/products/main.bicep diff --git a/modules/Microsoft.ApiManagement/service/products/version.json b/modules/ApiManagement/service/products/version.json similarity index 100% rename from modules/Microsoft.ApiManagement/service/products/version.json rename to modules/ApiManagement/service/products/version.json diff --git a/modules/Microsoft.ApiManagement/service/subscriptions/readme.md b/modules/ApiManagement/service/subscriptions/README.md similarity index 100% rename from modules/Microsoft.ApiManagement/service/subscriptions/readme.md rename to modules/ApiManagement/service/subscriptions/README.md diff --git a/modules/Microsoft.ApiManagement/service/subscriptions/main.bicep b/modules/ApiManagement/service/subscriptions/main.bicep similarity index 100% rename from modules/Microsoft.ApiManagement/service/subscriptions/main.bicep rename to modules/ApiManagement/service/subscriptions/main.bicep diff --git a/modules/Microsoft.ApiManagement/service/subscriptions/version.json b/modules/ApiManagement/service/subscriptions/version.json similarity index 100% rename from modules/Microsoft.ApiManagement/service/subscriptions/version.json rename to modules/ApiManagement/service/subscriptions/version.json diff --git a/modules/Microsoft.ApiManagement/service/version.json b/modules/ApiManagement/service/version.json similarity index 100% rename from modules/Microsoft.ApiManagement/service/version.json rename to modules/ApiManagement/service/version.json diff --git a/modules/Microsoft.App/containerApps/.bicep/nested_roleAssignments.bicep b/modules/App/containerApps/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.App/containerApps/.bicep/nested_roleAssignments.bicep rename to modules/App/containerApps/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.App/containerApps/.test/common/dependencies.bicep b/modules/App/containerApps/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.App/containerApps/.test/common/dependencies.bicep rename to modules/App/containerApps/.test/common/dependencies.bicep diff --git a/modules/Microsoft.App/containerApps/.test/common/main.test.bicep b/modules/App/containerApps/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.App/containerApps/.test/common/main.test.bicep rename to modules/App/containerApps/.test/common/main.test.bicep diff --git a/modules/Microsoft.App/containerApps/.test/min/dependencies.bicep b/modules/App/containerApps/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.App/containerApps/.test/min/dependencies.bicep rename to modules/App/containerApps/.test/min/dependencies.bicep diff --git a/modules/Microsoft.App/containerApps/.test/min/main.test.bicep b/modules/App/containerApps/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.App/containerApps/.test/min/main.test.bicep rename to modules/App/containerApps/.test/min/main.test.bicep diff --git a/modules/Microsoft.App/containerApps/readme.md b/modules/App/containerApps/README.md similarity index 100% rename from modules/Microsoft.App/containerApps/readme.md rename to modules/App/containerApps/README.md diff --git a/modules/Microsoft.App/containerApps/main.bicep b/modules/App/containerApps/main.bicep similarity index 100% rename from modules/Microsoft.App/containerApps/main.bicep rename to modules/App/containerApps/main.bicep diff --git a/modules/Microsoft.App/containerApps/version.json b/modules/App/containerApps/version.json similarity index 100% rename from modules/Microsoft.App/containerApps/version.json rename to modules/App/containerApps/version.json diff --git a/modules/Microsoft.App/managedEnvironments/.bicep/nested_roleAssignments.bicep b/modules/App/managedEnvironments/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.App/managedEnvironments/.bicep/nested_roleAssignments.bicep rename to modules/App/managedEnvironments/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.App/managedEnvironments/.test/common/dependencies.bicep b/modules/App/managedEnvironments/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.App/managedEnvironments/.test/common/dependencies.bicep rename to modules/App/managedEnvironments/.test/common/dependencies.bicep diff --git a/modules/Microsoft.App/managedEnvironments/.test/common/main.test.bicep b/modules/App/managedEnvironments/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.App/managedEnvironments/.test/common/main.test.bicep rename to modules/App/managedEnvironments/.test/common/main.test.bicep diff --git a/modules/Microsoft.App/managedEnvironments/.test/min/dependencies.bicep b/modules/App/managedEnvironments/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.App/managedEnvironments/.test/min/dependencies.bicep rename to modules/App/managedEnvironments/.test/min/dependencies.bicep diff --git a/modules/Microsoft.App/managedEnvironments/.test/min/main.test.bicep b/modules/App/managedEnvironments/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.App/managedEnvironments/.test/min/main.test.bicep rename to modules/App/managedEnvironments/.test/min/main.test.bicep diff --git a/modules/Microsoft.App/managedEnvironments/readme.md b/modules/App/managedEnvironments/README.md similarity index 100% rename from modules/Microsoft.App/managedEnvironments/readme.md rename to modules/App/managedEnvironments/README.md diff --git a/modules/Microsoft.App/managedEnvironments/main.bicep b/modules/App/managedEnvironments/main.bicep similarity index 100% rename from modules/Microsoft.App/managedEnvironments/main.bicep rename to modules/App/managedEnvironments/main.bicep diff --git a/modules/Microsoft.App/managedEnvironments/version.json b/modules/App/managedEnvironments/version.json similarity index 100% rename from modules/Microsoft.App/managedEnvironments/version.json rename to modules/App/managedEnvironments/version.json diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.bicep/nested_roleAssignments.bicep b/modules/AppConfiguration/configurationStores/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.AppConfiguration/configurationStores/.bicep/nested_roleAssignments.bicep rename to modules/AppConfiguration/configurationStores/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/common/dependencies.bicep b/modules/AppConfiguration/configurationStores/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.AppConfiguration/configurationStores/.test/common/dependencies.bicep rename to modules/AppConfiguration/configurationStores/.test/common/dependencies.bicep diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/common/main.test.bicep b/modules/AppConfiguration/configurationStores/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.AppConfiguration/configurationStores/.test/common/main.test.bicep rename to modules/AppConfiguration/configurationStores/.test/common/main.test.bicep diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/min/main.test.bicep b/modules/AppConfiguration/configurationStores/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.AppConfiguration/configurationStores/.test/min/main.test.bicep rename to modules/AppConfiguration/configurationStores/.test/min/main.test.bicep diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/dependencies.bicep b/modules/AppConfiguration/configurationStores/.test/pe/dependencies.bicep similarity index 100% rename from modules/Microsoft.AppConfiguration/configurationStores/.test/pe/dependencies.bicep rename to modules/AppConfiguration/configurationStores/.test/pe/dependencies.bicep diff --git a/modules/Microsoft.AppConfiguration/configurationStores/.test/pe/main.test.bicep b/modules/AppConfiguration/configurationStores/.test/pe/main.test.bicep similarity index 100% rename from modules/Microsoft.AppConfiguration/configurationStores/.test/pe/main.test.bicep rename to modules/AppConfiguration/configurationStores/.test/pe/main.test.bicep diff --git a/modules/Microsoft.AppConfiguration/configurationStores/readme.md b/modules/AppConfiguration/configurationStores/README.md similarity index 100% rename from modules/Microsoft.AppConfiguration/configurationStores/readme.md rename to modules/AppConfiguration/configurationStores/README.md diff --git a/modules/Microsoft.AppConfiguration/configurationStores/keyValues/.bicep/nested_roleAssignments.bicep b/modules/AppConfiguration/configurationStores/keyValues/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.AppConfiguration/configurationStores/keyValues/.bicep/nested_roleAssignments.bicep rename to modules/AppConfiguration/configurationStores/keyValues/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.AppConfiguration/configurationStores/keyValues/readme.md b/modules/AppConfiguration/configurationStores/keyValues/README.md similarity index 100% rename from modules/Microsoft.AppConfiguration/configurationStores/keyValues/readme.md rename to modules/AppConfiguration/configurationStores/keyValues/README.md diff --git a/modules/Microsoft.AppConfiguration/configurationStores/keyValues/main.bicep b/modules/AppConfiguration/configurationStores/keyValues/main.bicep similarity index 100% rename from modules/Microsoft.AppConfiguration/configurationStores/keyValues/main.bicep rename to modules/AppConfiguration/configurationStores/keyValues/main.bicep diff --git a/modules/Microsoft.AppConfiguration/configurationStores/keyValues/version.json b/modules/AppConfiguration/configurationStores/keyValues/version.json similarity index 100% rename from modules/Microsoft.AppConfiguration/configurationStores/keyValues/version.json rename to modules/AppConfiguration/configurationStores/keyValues/version.json diff --git a/modules/Microsoft.AppConfiguration/configurationStores/main.bicep b/modules/AppConfiguration/configurationStores/main.bicep similarity index 100% rename from modules/Microsoft.AppConfiguration/configurationStores/main.bicep rename to modules/AppConfiguration/configurationStores/main.bicep diff --git a/modules/Microsoft.AppConfiguration/configurationStores/version.json b/modules/AppConfiguration/configurationStores/version.json similarity index 100% rename from modules/Microsoft.AppConfiguration/configurationStores/version.json rename to modules/AppConfiguration/configurationStores/version.json diff --git a/modules/Microsoft.Automation/automationAccounts/.bicep/nested_roleAssignments.bicep b/modules/Automation/automationAccounts/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/.bicep/nested_roleAssignments.bicep rename to modules/Automation/automationAccounts/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Automation/automationAccounts/.test/common/dependencies.bicep b/modules/Automation/automationAccounts/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/.test/common/dependencies.bicep rename to modules/Automation/automationAccounts/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Automation/automationAccounts/.test/common/main.test.bicep b/modules/Automation/automationAccounts/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/.test/common/main.test.bicep rename to modules/Automation/automationAccounts/.test/common/main.test.bicep diff --git a/modules/Microsoft.Automation/automationAccounts/.test/encr/dependencies.bicep b/modules/Automation/automationAccounts/.test/encr/dependencies.bicep similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/.test/encr/dependencies.bicep rename to modules/Automation/automationAccounts/.test/encr/dependencies.bicep diff --git a/modules/Microsoft.Automation/automationAccounts/.test/encr/main.test.bicep b/modules/Automation/automationAccounts/.test/encr/main.test.bicep similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/.test/encr/main.test.bicep rename to modules/Automation/automationAccounts/.test/encr/main.test.bicep diff --git a/modules/Microsoft.Automation/automationAccounts/.test/min/main.test.bicep b/modules/Automation/automationAccounts/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/.test/min/main.test.bicep rename to modules/Automation/automationAccounts/.test/min/main.test.bicep diff --git a/modules/Microsoft.Automation/automationAccounts/readme.md b/modules/Automation/automationAccounts/README.md similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/readme.md rename to modules/Automation/automationAccounts/README.md diff --git a/modules/Microsoft.Automation/automationAccounts/jobSchedules/readme.md b/modules/Automation/automationAccounts/jobSchedules/README.md similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/jobSchedules/readme.md rename to modules/Automation/automationAccounts/jobSchedules/README.md diff --git a/modules/Microsoft.Automation/automationAccounts/jobSchedules/main.bicep b/modules/Automation/automationAccounts/jobSchedules/main.bicep similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/jobSchedules/main.bicep rename to modules/Automation/automationAccounts/jobSchedules/main.bicep diff --git a/modules/Microsoft.Automation/automationAccounts/jobSchedules/version.json b/modules/Automation/automationAccounts/jobSchedules/version.json similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/jobSchedules/version.json rename to modules/Automation/automationAccounts/jobSchedules/version.json diff --git a/modules/Microsoft.Automation/automationAccounts/main.bicep b/modules/Automation/automationAccounts/main.bicep similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/main.bicep rename to modules/Automation/automationAccounts/main.bicep diff --git a/modules/Microsoft.Automation/automationAccounts/modules/readme.md b/modules/Automation/automationAccounts/modules/README.md similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/modules/readme.md rename to modules/Automation/automationAccounts/modules/README.md diff --git a/modules/Microsoft.Automation/automationAccounts/modules/main.bicep b/modules/Automation/automationAccounts/modules/main.bicep similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/modules/main.bicep rename to modules/Automation/automationAccounts/modules/main.bicep diff --git a/modules/Microsoft.Automation/automationAccounts/modules/version.json b/modules/Automation/automationAccounts/modules/version.json similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/modules/version.json rename to modules/Automation/automationAccounts/modules/version.json diff --git a/modules/Microsoft.Automation/automationAccounts/runbooks/readme.md b/modules/Automation/automationAccounts/runbooks/README.md similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/runbooks/readme.md rename to modules/Automation/automationAccounts/runbooks/README.md diff --git a/modules/Microsoft.Automation/automationAccounts/runbooks/main.bicep b/modules/Automation/automationAccounts/runbooks/main.bicep similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/runbooks/main.bicep rename to modules/Automation/automationAccounts/runbooks/main.bicep diff --git a/modules/Microsoft.Automation/automationAccounts/runbooks/version.json b/modules/Automation/automationAccounts/runbooks/version.json similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/runbooks/version.json rename to modules/Automation/automationAccounts/runbooks/version.json diff --git a/modules/Microsoft.Automation/automationAccounts/schedules/readme.md b/modules/Automation/automationAccounts/schedules/README.md similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/schedules/readme.md rename to modules/Automation/automationAccounts/schedules/README.md diff --git a/modules/Microsoft.Automation/automationAccounts/schedules/main.bicep b/modules/Automation/automationAccounts/schedules/main.bicep similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/schedules/main.bicep rename to modules/Automation/automationAccounts/schedules/main.bicep diff --git a/modules/Microsoft.Automation/automationAccounts/schedules/version.json b/modules/Automation/automationAccounts/schedules/version.json similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/schedules/version.json rename to modules/Automation/automationAccounts/schedules/version.json diff --git a/modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/readme.md b/modules/Automation/automationAccounts/softwareUpdateConfigurations/README.md similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/readme.md rename to modules/Automation/automationAccounts/softwareUpdateConfigurations/README.md diff --git a/modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/main.bicep b/modules/Automation/automationAccounts/softwareUpdateConfigurations/main.bicep similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/main.bicep rename to modules/Automation/automationAccounts/softwareUpdateConfigurations/main.bicep diff --git a/modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json b/modules/Automation/automationAccounts/softwareUpdateConfigurations/version.json similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json rename to modules/Automation/automationAccounts/softwareUpdateConfigurations/version.json diff --git a/modules/Microsoft.Automation/automationAccounts/variables/readme.md b/modules/Automation/automationAccounts/variables/README.md similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/variables/readme.md rename to modules/Automation/automationAccounts/variables/README.md diff --git a/modules/Microsoft.Automation/automationAccounts/variables/main.bicep b/modules/Automation/automationAccounts/variables/main.bicep similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/variables/main.bicep rename to modules/Automation/automationAccounts/variables/main.bicep diff --git a/modules/Microsoft.Automation/automationAccounts/variables/version.json b/modules/Automation/automationAccounts/variables/version.json similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/variables/version.json rename to modules/Automation/automationAccounts/variables/version.json diff --git a/modules/Microsoft.Automation/automationAccounts/version.json b/modules/Automation/automationAccounts/version.json similarity index 100% rename from modules/Microsoft.Automation/automationAccounts/version.json rename to modules/Automation/automationAccounts/version.json diff --git a/modules/Microsoft.Batch/batchAccounts/.test/common/dependencies.bicep b/modules/Batch/batchAccounts/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Batch/batchAccounts/.test/common/dependencies.bicep rename to modules/Batch/batchAccounts/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Batch/batchAccounts/.test/common/main.test.bicep b/modules/Batch/batchAccounts/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Batch/batchAccounts/.test/common/main.test.bicep rename to modules/Batch/batchAccounts/.test/common/main.test.bicep diff --git a/modules/Microsoft.Batch/batchAccounts/.test/encr/dependencies.bicep b/modules/Batch/batchAccounts/.test/encr/dependencies.bicep similarity index 100% rename from modules/Microsoft.Batch/batchAccounts/.test/encr/dependencies.bicep rename to modules/Batch/batchAccounts/.test/encr/dependencies.bicep diff --git a/modules/Microsoft.Batch/batchAccounts/.test/encr/main.test.bicep b/modules/Batch/batchAccounts/.test/encr/main.test.bicep similarity index 100% rename from modules/Microsoft.Batch/batchAccounts/.test/encr/main.test.bicep rename to modules/Batch/batchAccounts/.test/encr/main.test.bicep diff --git a/modules/Microsoft.Batch/batchAccounts/.test/min/dependencies.bicep b/modules/Batch/batchAccounts/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.Batch/batchAccounts/.test/min/dependencies.bicep rename to modules/Batch/batchAccounts/.test/min/dependencies.bicep diff --git a/modules/Microsoft.Batch/batchAccounts/.test/min/main.test.bicep b/modules/Batch/batchAccounts/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Batch/batchAccounts/.test/min/main.test.bicep rename to modules/Batch/batchAccounts/.test/min/main.test.bicep diff --git a/modules/Microsoft.Batch/batchAccounts/readme.md b/modules/Batch/batchAccounts/README.md similarity index 100% rename from modules/Microsoft.Batch/batchAccounts/readme.md rename to modules/Batch/batchAccounts/README.md diff --git a/modules/Microsoft.Batch/batchAccounts/main.bicep b/modules/Batch/batchAccounts/main.bicep similarity index 100% rename from modules/Microsoft.Batch/batchAccounts/main.bicep rename to modules/Batch/batchAccounts/main.bicep diff --git a/modules/Microsoft.Batch/batchAccounts/version.json b/modules/Batch/batchAccounts/version.json similarity index 100% rename from modules/Microsoft.Batch/batchAccounts/version.json rename to modules/Batch/batchAccounts/version.json diff --git a/modules/Microsoft.CDN/profiles/.bicep/nested_roleAssignments.bicep b/modules/CDN/profiles/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.CDN/profiles/.bicep/nested_roleAssignments.bicep rename to modules/CDN/profiles/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.CDN/profiles/.test/common/dependencies.bicep b/modules/CDN/profiles/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.CDN/profiles/.test/common/dependencies.bicep rename to modules/CDN/profiles/.test/common/dependencies.bicep diff --git a/modules/Microsoft.CDN/profiles/.test/common/main.test.bicep b/modules/CDN/profiles/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.CDN/profiles/.test/common/main.test.bicep rename to modules/CDN/profiles/.test/common/main.test.bicep diff --git a/modules/Microsoft.CDN/profiles/readme.md b/modules/CDN/profiles/README.md similarity index 100% rename from modules/Microsoft.CDN/profiles/readme.md rename to modules/CDN/profiles/README.md diff --git a/modules/Microsoft.CDN/profiles/endpoints/readme.md b/modules/CDN/profiles/endpoints/README.md similarity index 100% rename from modules/Microsoft.CDN/profiles/endpoints/readme.md rename to modules/CDN/profiles/endpoints/README.md diff --git a/modules/Microsoft.CDN/profiles/endpoints/main.bicep b/modules/CDN/profiles/endpoints/main.bicep similarity index 100% rename from modules/Microsoft.CDN/profiles/endpoints/main.bicep rename to modules/CDN/profiles/endpoints/main.bicep diff --git a/modules/Microsoft.CDN/profiles/endpoints/origins/readme.md b/modules/CDN/profiles/endpoints/origins/README.md similarity index 100% rename from modules/Microsoft.CDN/profiles/endpoints/origins/readme.md rename to modules/CDN/profiles/endpoints/origins/README.md diff --git a/modules/Microsoft.CDN/profiles/endpoints/origins/main.bicep b/modules/CDN/profiles/endpoints/origins/main.bicep similarity index 100% rename from modules/Microsoft.CDN/profiles/endpoints/origins/main.bicep rename to modules/CDN/profiles/endpoints/origins/main.bicep diff --git a/modules/Microsoft.CDN/profiles/endpoints/origins/version.json b/modules/CDN/profiles/endpoints/origins/version.json similarity index 100% rename from modules/Microsoft.CDN/profiles/endpoints/origins/version.json rename to modules/CDN/profiles/endpoints/origins/version.json diff --git a/modules/Microsoft.CDN/profiles/endpoints/version.json b/modules/CDN/profiles/endpoints/version.json similarity index 100% rename from modules/Microsoft.CDN/profiles/endpoints/version.json rename to modules/CDN/profiles/endpoints/version.json diff --git a/modules/Microsoft.CDN/profiles/main.bicep b/modules/CDN/profiles/main.bicep similarity index 100% rename from modules/Microsoft.CDN/profiles/main.bicep rename to modules/CDN/profiles/main.bicep diff --git a/modules/Microsoft.CDN/profiles/version.json b/modules/CDN/profiles/version.json similarity index 100% rename from modules/Microsoft.CDN/profiles/version.json rename to modules/CDN/profiles/version.json diff --git a/modules/Microsoft.Cache/redis/.bicep/nested_roleAssignments.bicep b/modules/Cache/redis/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Cache/redis/.bicep/nested_roleAssignments.bicep rename to modules/Cache/redis/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Cache/redis/.test/common/dependencies.bicep b/modules/Cache/redis/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Cache/redis/.test/common/dependencies.bicep rename to modules/Cache/redis/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Cache/redis/.test/common/main.test.bicep b/modules/Cache/redis/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Cache/redis/.test/common/main.test.bicep rename to modules/Cache/redis/.test/common/main.test.bicep diff --git a/modules/Microsoft.Cache/redis/.test/min/main.test.bicep b/modules/Cache/redis/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Cache/redis/.test/min/main.test.bicep rename to modules/Cache/redis/.test/min/main.test.bicep diff --git a/modules/Microsoft.Cache/redis/readme.md b/modules/Cache/redis/README.md similarity index 100% rename from modules/Microsoft.Cache/redis/readme.md rename to modules/Cache/redis/README.md diff --git a/modules/Microsoft.Cache/redis/main.bicep b/modules/Cache/redis/main.bicep similarity index 100% rename from modules/Microsoft.Cache/redis/main.bicep rename to modules/Cache/redis/main.bicep diff --git a/modules/Microsoft.Cache/redis/version.json b/modules/Cache/redis/version.json similarity index 100% rename from modules/Microsoft.Cache/redis/version.json rename to modules/Cache/redis/version.json diff --git a/modules/Microsoft.CognitiveServices/accounts/.bicep/nested_roleAssignments.bicep b/modules/CognitiveServices/accounts/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.CognitiveServices/accounts/.bicep/nested_roleAssignments.bicep rename to modules/CognitiveServices/accounts/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.CognitiveServices/accounts/.test/common/dependencies.bicep b/modules/CognitiveServices/accounts/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.CognitiveServices/accounts/.test/common/dependencies.bicep rename to modules/CognitiveServices/accounts/.test/common/dependencies.bicep diff --git a/modules/Microsoft.CognitiveServices/accounts/.test/common/main.test.bicep b/modules/CognitiveServices/accounts/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.CognitiveServices/accounts/.test/common/main.test.bicep rename to modules/CognitiveServices/accounts/.test/common/main.test.bicep diff --git a/modules/Microsoft.CognitiveServices/accounts/.test/encr/dependencies.bicep b/modules/CognitiveServices/accounts/.test/encr/dependencies.bicep similarity index 100% rename from modules/Microsoft.CognitiveServices/accounts/.test/encr/dependencies.bicep rename to modules/CognitiveServices/accounts/.test/encr/dependencies.bicep diff --git a/modules/Microsoft.CognitiveServices/accounts/.test/encr/main.test.bicep b/modules/CognitiveServices/accounts/.test/encr/main.test.bicep similarity index 100% rename from modules/Microsoft.CognitiveServices/accounts/.test/encr/main.test.bicep rename to modules/CognitiveServices/accounts/.test/encr/main.test.bicep diff --git a/modules/Microsoft.CognitiveServices/accounts/.test/min/main.test.bicep b/modules/CognitiveServices/accounts/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.CognitiveServices/accounts/.test/min/main.test.bicep rename to modules/CognitiveServices/accounts/.test/min/main.test.bicep diff --git a/modules/Microsoft.CognitiveServices/accounts/.test/speech/dependencies.bicep b/modules/CognitiveServices/accounts/.test/speech/dependencies.bicep similarity index 100% rename from modules/Microsoft.CognitiveServices/accounts/.test/speech/dependencies.bicep rename to modules/CognitiveServices/accounts/.test/speech/dependencies.bicep diff --git a/modules/Microsoft.CognitiveServices/accounts/.test/speech/main.test.bicep b/modules/CognitiveServices/accounts/.test/speech/main.test.bicep similarity index 100% rename from modules/Microsoft.CognitiveServices/accounts/.test/speech/main.test.bicep rename to modules/CognitiveServices/accounts/.test/speech/main.test.bicep diff --git a/modules/Microsoft.CognitiveServices/accounts/readme.md b/modules/CognitiveServices/accounts/README.md similarity index 100% rename from modules/Microsoft.CognitiveServices/accounts/readme.md rename to modules/CognitiveServices/accounts/README.md diff --git a/modules/Microsoft.CognitiveServices/accounts/main.bicep b/modules/CognitiveServices/accounts/main.bicep similarity index 100% rename from modules/Microsoft.CognitiveServices/accounts/main.bicep rename to modules/CognitiveServices/accounts/main.bicep diff --git a/modules/Microsoft.CognitiveServices/accounts/version.json b/modules/CognitiveServices/accounts/version.json similarity index 100% rename from modules/Microsoft.CognitiveServices/accounts/version.json rename to modules/CognitiveServices/accounts/version.json diff --git a/modules/Microsoft.Compute/availabilitySets/.bicep/nested_roleAssignments.bicep b/modules/Compute/availabilitySets/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Compute/availabilitySets/.bicep/nested_roleAssignments.bicep rename to modules/Compute/availabilitySets/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Compute/availabilitySets/.test/common/dependencies.bicep b/modules/Compute/availabilitySets/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/availabilitySets/.test/common/dependencies.bicep rename to modules/Compute/availabilitySets/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Compute/availabilitySets/.test/common/main.test.bicep b/modules/Compute/availabilitySets/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/availabilitySets/.test/common/main.test.bicep rename to modules/Compute/availabilitySets/.test/common/main.test.bicep diff --git a/modules/Microsoft.Compute/availabilitySets/.test/min/main.test.bicep b/modules/Compute/availabilitySets/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/availabilitySets/.test/min/main.test.bicep rename to modules/Compute/availabilitySets/.test/min/main.test.bicep diff --git a/modules/Microsoft.Compute/availabilitySets/readme.md b/modules/Compute/availabilitySets/README.md similarity index 100% rename from modules/Microsoft.Compute/availabilitySets/readme.md rename to modules/Compute/availabilitySets/README.md diff --git a/modules/Microsoft.Compute/availabilitySets/main.bicep b/modules/Compute/availabilitySets/main.bicep similarity index 100% rename from modules/Microsoft.Compute/availabilitySets/main.bicep rename to modules/Compute/availabilitySets/main.bicep diff --git a/modules/Microsoft.Compute/availabilitySets/version.json b/modules/Compute/availabilitySets/version.json similarity index 100% rename from modules/Microsoft.Compute/availabilitySets/version.json rename to modules/Compute/availabilitySets/version.json diff --git a/modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_keyVaultPermissions.bicep b/modules/Compute/diskEncryptionSets/.bicep/nested_keyVaultPermissions.bicep similarity index 100% rename from modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_keyVaultPermissions.bicep rename to modules/Compute/diskEncryptionSets/.bicep/nested_keyVaultPermissions.bicep diff --git a/modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_managedIdentityReference.bicep b/modules/Compute/diskEncryptionSets/.bicep/nested_managedIdentityReference.bicep similarity index 100% rename from modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_managedIdentityReference.bicep rename to modules/Compute/diskEncryptionSets/.bicep/nested_managedIdentityReference.bicep diff --git a/modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_roleAssignments.bicep b/modules/Compute/diskEncryptionSets/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Compute/diskEncryptionSets/.bicep/nested_roleAssignments.bicep rename to modules/Compute/diskEncryptionSets/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Compute/diskEncryptionSets/.test/accessPolicies/dependencies.bicep b/modules/Compute/diskEncryptionSets/.test/accessPolicies/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/diskEncryptionSets/.test/accessPolicies/dependencies.bicep rename to modules/Compute/diskEncryptionSets/.test/accessPolicies/dependencies.bicep diff --git a/modules/Microsoft.Compute/diskEncryptionSets/.test/accessPolicies/main.test.bicep b/modules/Compute/diskEncryptionSets/.test/accessPolicies/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/diskEncryptionSets/.test/accessPolicies/main.test.bicep rename to modules/Compute/diskEncryptionSets/.test/accessPolicies/main.test.bicep diff --git a/modules/Microsoft.Compute/diskEncryptionSets/.test/common/dependencies.bicep b/modules/Compute/diskEncryptionSets/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/diskEncryptionSets/.test/common/dependencies.bicep rename to modules/Compute/diskEncryptionSets/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Compute/diskEncryptionSets/.test/common/main.test.bicep b/modules/Compute/diskEncryptionSets/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/diskEncryptionSets/.test/common/main.test.bicep rename to modules/Compute/diskEncryptionSets/.test/common/main.test.bicep diff --git a/modules/Microsoft.Compute/diskEncryptionSets/readme.md b/modules/Compute/diskEncryptionSets/README.md similarity index 100% rename from modules/Microsoft.Compute/diskEncryptionSets/readme.md rename to modules/Compute/diskEncryptionSets/README.md diff --git a/modules/Microsoft.Compute/diskEncryptionSets/main.bicep b/modules/Compute/diskEncryptionSets/main.bicep similarity index 100% rename from modules/Microsoft.Compute/diskEncryptionSets/main.bicep rename to modules/Compute/diskEncryptionSets/main.bicep diff --git a/modules/Microsoft.Compute/diskEncryptionSets/version.json b/modules/Compute/diskEncryptionSets/version.json similarity index 100% rename from modules/Microsoft.Compute/diskEncryptionSets/version.json rename to modules/Compute/diskEncryptionSets/version.json diff --git a/modules/Microsoft.Compute/disks/.bicep/nested_roleAssignments.bicep b/modules/Compute/disks/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Compute/disks/.bicep/nested_roleAssignments.bicep rename to modules/Compute/disks/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Compute/disks/.test/common/dependencies.bicep b/modules/Compute/disks/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/disks/.test/common/dependencies.bicep rename to modules/Compute/disks/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Compute/disks/.test/common/main.test.bicep b/modules/Compute/disks/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/disks/.test/common/main.test.bicep rename to modules/Compute/disks/.test/common/main.test.bicep diff --git a/modules/Microsoft.Compute/disks/.test/image/dependencies.bicep b/modules/Compute/disks/.test/image/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/disks/.test/image/dependencies.bicep rename to modules/Compute/disks/.test/image/dependencies.bicep diff --git a/modules/Microsoft.Compute/disks/.test/image/main.test.bicep b/modules/Compute/disks/.test/image/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/disks/.test/image/main.test.bicep rename to modules/Compute/disks/.test/image/main.test.bicep diff --git a/modules/Microsoft.Compute/disks/.test/import/dependencies.bicep b/modules/Compute/disks/.test/import/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/disks/.test/import/dependencies.bicep rename to modules/Compute/disks/.test/import/dependencies.bicep diff --git a/modules/Microsoft.Compute/disks/.test/import/dependencies_rbac.bicep b/modules/Compute/disks/.test/import/dependencies_rbac.bicep similarity index 100% rename from modules/Microsoft.Compute/disks/.test/import/dependencies_rbac.bicep rename to modules/Compute/disks/.test/import/dependencies_rbac.bicep diff --git a/modules/Microsoft.Compute/disks/.test/import/main.test.bicep b/modules/Compute/disks/.test/import/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/disks/.test/import/main.test.bicep rename to modules/Compute/disks/.test/import/main.test.bicep diff --git a/modules/Microsoft.Compute/disks/.test/min/main.test.bicep b/modules/Compute/disks/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/disks/.test/min/main.test.bicep rename to modules/Compute/disks/.test/min/main.test.bicep diff --git a/modules/Microsoft.Compute/disks/readme.md b/modules/Compute/disks/README.md similarity index 100% rename from modules/Microsoft.Compute/disks/readme.md rename to modules/Compute/disks/README.md diff --git a/modules/Microsoft.Compute/disks/main.bicep b/modules/Compute/disks/main.bicep similarity index 100% rename from modules/Microsoft.Compute/disks/main.bicep rename to modules/Compute/disks/main.bicep diff --git a/modules/Microsoft.Compute/disks/version.json b/modules/Compute/disks/version.json similarity index 100% rename from modules/Microsoft.Compute/disks/version.json rename to modules/Compute/disks/version.json diff --git a/modules/Microsoft.Compute/galleries/.bicep/nested_roleAssignments.bicep b/modules/Compute/galleries/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Compute/galleries/.bicep/nested_roleAssignments.bicep rename to modules/Compute/galleries/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Compute/galleries/.test/common/dependencies.bicep b/modules/Compute/galleries/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/galleries/.test/common/dependencies.bicep rename to modules/Compute/galleries/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Compute/galleries/.test/common/main.test.bicep b/modules/Compute/galleries/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/galleries/.test/common/main.test.bicep rename to modules/Compute/galleries/.test/common/main.test.bicep diff --git a/modules/Microsoft.Compute/galleries/.test/min/main.test.bicep b/modules/Compute/galleries/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/galleries/.test/min/main.test.bicep rename to modules/Compute/galleries/.test/min/main.test.bicep diff --git a/modules/Microsoft.Compute/galleries/readme.md b/modules/Compute/galleries/README.md similarity index 100% rename from modules/Microsoft.Compute/galleries/readme.md rename to modules/Compute/galleries/README.md diff --git a/modules/Microsoft.Compute/galleries/applications/.bicep/nested_roleAssignments.bicep b/modules/Compute/galleries/applications/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Compute/galleries/applications/.bicep/nested_roleAssignments.bicep rename to modules/Compute/galleries/applications/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Compute/galleries/applications/readme.md b/modules/Compute/galleries/applications/README.md similarity index 100% rename from modules/Microsoft.Compute/galleries/applications/readme.md rename to modules/Compute/galleries/applications/README.md diff --git a/modules/Microsoft.Compute/galleries/applications/main.bicep b/modules/Compute/galleries/applications/main.bicep similarity index 100% rename from modules/Microsoft.Compute/galleries/applications/main.bicep rename to modules/Compute/galleries/applications/main.bicep diff --git a/modules/Microsoft.Compute/galleries/applications/version.json b/modules/Compute/galleries/applications/version.json similarity index 100% rename from modules/Microsoft.Compute/galleries/applications/version.json rename to modules/Compute/galleries/applications/version.json diff --git a/modules/Microsoft.Compute/galleries/images/.bicep/nested_roleAssignments.bicep b/modules/Compute/galleries/images/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Compute/galleries/images/.bicep/nested_roleAssignments.bicep rename to modules/Compute/galleries/images/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Compute/galleries/images/readme.md b/modules/Compute/galleries/images/README.md similarity index 100% rename from modules/Microsoft.Compute/galleries/images/readme.md rename to modules/Compute/galleries/images/README.md diff --git a/modules/Microsoft.Compute/galleries/images/main.bicep b/modules/Compute/galleries/images/main.bicep similarity index 100% rename from modules/Microsoft.Compute/galleries/images/main.bicep rename to modules/Compute/galleries/images/main.bicep diff --git a/modules/Microsoft.Compute/galleries/images/version.json b/modules/Compute/galleries/images/version.json similarity index 100% rename from modules/Microsoft.Compute/galleries/images/version.json rename to modules/Compute/galleries/images/version.json diff --git a/modules/Microsoft.Compute/galleries/main.bicep b/modules/Compute/galleries/main.bicep similarity index 100% rename from modules/Microsoft.Compute/galleries/main.bicep rename to modules/Compute/galleries/main.bicep diff --git a/modules/Microsoft.Compute/galleries/version.json b/modules/Compute/galleries/version.json similarity index 100% rename from modules/Microsoft.Compute/galleries/version.json rename to modules/Compute/galleries/version.json diff --git a/modules/Microsoft.Compute/images/.bicep/nested_roleAssignments.bicep b/modules/Compute/images/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Compute/images/.bicep/nested_roleAssignments.bicep rename to modules/Compute/images/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Compute/images/.test/common/dependencies.bicep b/modules/Compute/images/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/images/.test/common/dependencies.bicep rename to modules/Compute/images/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Compute/images/.test/common/dependencies_rbac.bicep b/modules/Compute/images/.test/common/dependencies_rbac.bicep similarity index 100% rename from modules/Microsoft.Compute/images/.test/common/dependencies_rbac.bicep rename to modules/Compute/images/.test/common/dependencies_rbac.bicep diff --git a/modules/Microsoft.Compute/images/.test/common/main.test.bicep b/modules/Compute/images/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/images/.test/common/main.test.bicep rename to modules/Compute/images/.test/common/main.test.bicep diff --git a/modules/Microsoft.Compute/images/readme.md b/modules/Compute/images/README.md similarity index 100% rename from modules/Microsoft.Compute/images/readme.md rename to modules/Compute/images/README.md diff --git a/modules/Microsoft.Compute/images/main.bicep b/modules/Compute/images/main.bicep similarity index 100% rename from modules/Microsoft.Compute/images/main.bicep rename to modules/Compute/images/main.bicep diff --git a/modules/Microsoft.Compute/images/version.json b/modules/Compute/images/version.json similarity index 100% rename from modules/Microsoft.Compute/images/version.json rename to modules/Compute/images/version.json diff --git a/modules/Microsoft.Compute/proximityPlacementGroups/.bicep/nested_roleAssignments.bicep b/modules/Compute/proximityPlacementGroups/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Compute/proximityPlacementGroups/.bicep/nested_roleAssignments.bicep rename to modules/Compute/proximityPlacementGroups/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Compute/proximityPlacementGroups/.test/common/dependencies.bicep b/modules/Compute/proximityPlacementGroups/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/proximityPlacementGroups/.test/common/dependencies.bicep rename to modules/Compute/proximityPlacementGroups/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Compute/proximityPlacementGroups/.test/common/main.test.bicep b/modules/Compute/proximityPlacementGroups/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/proximityPlacementGroups/.test/common/main.test.bicep rename to modules/Compute/proximityPlacementGroups/.test/common/main.test.bicep diff --git a/modules/Microsoft.Compute/proximityPlacementGroups/.test/min/main.test.bicep b/modules/Compute/proximityPlacementGroups/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/proximityPlacementGroups/.test/min/main.test.bicep rename to modules/Compute/proximityPlacementGroups/.test/min/main.test.bicep diff --git a/modules/Microsoft.Compute/proximityPlacementGroups/readme.md b/modules/Compute/proximityPlacementGroups/README.md similarity index 100% rename from modules/Microsoft.Compute/proximityPlacementGroups/readme.md rename to modules/Compute/proximityPlacementGroups/README.md diff --git a/modules/Microsoft.Compute/proximityPlacementGroups/main.bicep b/modules/Compute/proximityPlacementGroups/main.bicep similarity index 100% rename from modules/Microsoft.Compute/proximityPlacementGroups/main.bicep rename to modules/Compute/proximityPlacementGroups/main.bicep diff --git a/modules/Microsoft.Compute/proximityPlacementGroups/version.json b/modules/Compute/proximityPlacementGroups/version.json similarity index 100% rename from modules/Microsoft.Compute/proximityPlacementGroups/version.json rename to modules/Compute/proximityPlacementGroups/version.json diff --git a/modules/Microsoft.Compute/sshPublicKeys/.bicep/nested_roleAssignments.bicep b/modules/Compute/sshPublicKeys/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Compute/sshPublicKeys/.bicep/nested_roleAssignments.bicep rename to modules/Compute/sshPublicKeys/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Compute/sshPublicKeys/.test/common/dependencies.bicep b/modules/Compute/sshPublicKeys/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/sshPublicKeys/.test/common/dependencies.bicep rename to modules/Compute/sshPublicKeys/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Compute/sshPublicKeys/.test/common/main.test.bicep b/modules/Compute/sshPublicKeys/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/sshPublicKeys/.test/common/main.test.bicep rename to modules/Compute/sshPublicKeys/.test/common/main.test.bicep diff --git a/modules/Microsoft.Compute/sshPublicKeys/.test/min/main.test.bicep b/modules/Compute/sshPublicKeys/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/sshPublicKeys/.test/min/main.test.bicep rename to modules/Compute/sshPublicKeys/.test/min/main.test.bicep diff --git a/modules/Microsoft.Compute/sshPublicKeys/readme.md b/modules/Compute/sshPublicKeys/README.md similarity index 100% rename from modules/Microsoft.Compute/sshPublicKeys/readme.md rename to modules/Compute/sshPublicKeys/README.md diff --git a/modules/Microsoft.Compute/sshPublicKeys/main.bicep b/modules/Compute/sshPublicKeys/main.bicep similarity index 100% rename from modules/Microsoft.Compute/sshPublicKeys/main.bicep rename to modules/Compute/sshPublicKeys/main.bicep diff --git a/modules/Microsoft.Compute/sshPublicKeys/version.json b/modules/Compute/sshPublicKeys/version.json similarity index 100% rename from modules/Microsoft.Compute/sshPublicKeys/version.json rename to modules/Compute/sshPublicKeys/version.json diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.bicep/nested_roleAssignments.bicep b/modules/Compute/virtualMachineScaleSets/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachineScaleSets/.bicep/nested_roleAssignments.bicep rename to modules/Compute/virtualMachineScaleSets/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.min/dependencies.bicep b/modules/Compute/virtualMachineScaleSets/.test/linux.min/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.min/dependencies.bicep rename to modules/Compute/virtualMachineScaleSets/.test/linux.min/dependencies.bicep diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.min/main.test.bicep b/modules/Compute/virtualMachineScaleSets/.test/linux.min/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.min/main.test.bicep rename to modules/Compute/virtualMachineScaleSets/.test/linux.min/main.test.bicep diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.ssecmk/dependencies.bicep b/modules/Compute/virtualMachineScaleSets/.test/linux.ssecmk/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.ssecmk/dependencies.bicep rename to modules/Compute/virtualMachineScaleSets/.test/linux.ssecmk/dependencies.bicep diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.ssecmk/main.test.bicep b/modules/Compute/virtualMachineScaleSets/.test/linux.ssecmk/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux.ssecmk/main.test.bicep rename to modules/Compute/virtualMachineScaleSets/.test/linux.ssecmk/main.test.bicep diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux/dependencies.bicep b/modules/Compute/virtualMachineScaleSets/.test/linux/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux/dependencies.bicep rename to modules/Compute/virtualMachineScaleSets/.test/linux/dependencies.bicep diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux/main.test.bicep b/modules/Compute/virtualMachineScaleSets/.test/linux/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachineScaleSets/.test/linux/main.test.bicep rename to modules/Compute/virtualMachineScaleSets/.test/linux/main.test.bicep diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows.min/dependencies.bicep b/modules/Compute/virtualMachineScaleSets/.test/windows.min/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows.min/dependencies.bicep rename to modules/Compute/virtualMachineScaleSets/.test/windows.min/dependencies.bicep diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows.min/main.test.bicep b/modules/Compute/virtualMachineScaleSets/.test/windows.min/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows.min/main.test.bicep rename to modules/Compute/virtualMachineScaleSets/.test/windows.min/main.test.bicep diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows/dependencies.bicep b/modules/Compute/virtualMachineScaleSets/.test/windows/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows/dependencies.bicep rename to modules/Compute/virtualMachineScaleSets/.test/windows/dependencies.bicep diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows/main.test.bicep b/modules/Compute/virtualMachineScaleSets/.test/windows/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachineScaleSets/.test/windows/main.test.bicep rename to modules/Compute/virtualMachineScaleSets/.test/windows/main.test.bicep diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/readme.md b/modules/Compute/virtualMachineScaleSets/README.md similarity index 100% rename from modules/Microsoft.Compute/virtualMachineScaleSets/readme.md rename to modules/Compute/virtualMachineScaleSets/README.md diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/extensions/readme.md b/modules/Compute/virtualMachineScaleSets/extensions/README.md similarity index 100% rename from modules/Microsoft.Compute/virtualMachineScaleSets/extensions/readme.md rename to modules/Compute/virtualMachineScaleSets/extensions/README.md diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/extensions/main.bicep b/modules/Compute/virtualMachineScaleSets/extensions/main.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachineScaleSets/extensions/main.bicep rename to modules/Compute/virtualMachineScaleSets/extensions/main.bicep diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json b/modules/Compute/virtualMachineScaleSets/extensions/version.json similarity index 100% rename from modules/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json rename to modules/Compute/virtualMachineScaleSets/extensions/version.json diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/main.bicep b/modules/Compute/virtualMachineScaleSets/main.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachineScaleSets/main.bicep rename to modules/Compute/virtualMachineScaleSets/main.bicep diff --git a/modules/Microsoft.Compute/virtualMachineScaleSets/version.json b/modules/Compute/virtualMachineScaleSets/version.json similarity index 100% rename from modules/Microsoft.Compute/virtualMachineScaleSets/version.json rename to modules/Compute/virtualMachineScaleSets/version.json diff --git a/modules/Microsoft.Compute/virtualMachines/.bicep/nested_networkInterface.bicep b/modules/Compute/virtualMachines/.bicep/nested_networkInterface.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/.bicep/nested_networkInterface.bicep rename to modules/Compute/virtualMachines/.bicep/nested_networkInterface.bicep diff --git a/modules/Microsoft.Compute/virtualMachines/.bicep/nested_roleAssignments.bicep b/modules/Compute/virtualMachines/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/.bicep/nested_roleAssignments.bicep rename to modules/Compute/virtualMachines/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Compute/virtualMachines/.test/linux.atmg/dependencies.bicep b/modules/Compute/virtualMachines/.test/linux.atmg/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/.test/linux.atmg/dependencies.bicep rename to modules/Compute/virtualMachines/.test/linux.atmg/dependencies.bicep diff --git a/modules/Microsoft.Compute/virtualMachines/.test/linux.atmg/main.test.bicep b/modules/Compute/virtualMachines/.test/linux.atmg/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/.test/linux.atmg/main.test.bicep rename to modules/Compute/virtualMachines/.test/linux.atmg/main.test.bicep diff --git a/modules/Microsoft.Compute/virtualMachines/.test/linux.min/dependencies.bicep b/modules/Compute/virtualMachines/.test/linux.min/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/.test/linux.min/dependencies.bicep rename to modules/Compute/virtualMachines/.test/linux.min/dependencies.bicep diff --git a/modules/Microsoft.Compute/virtualMachines/.test/linux.min/main.test.bicep b/modules/Compute/virtualMachines/.test/linux.min/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/.test/linux.min/main.test.bicep rename to modules/Compute/virtualMachines/.test/linux.min/main.test.bicep diff --git a/modules/Microsoft.Compute/virtualMachines/.test/linux/dependencies.bicep b/modules/Compute/virtualMachines/.test/linux/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/.test/linux/dependencies.bicep rename to modules/Compute/virtualMachines/.test/linux/dependencies.bicep diff --git a/modules/Microsoft.Compute/virtualMachines/.test/linux/main.test.bicep b/modules/Compute/virtualMachines/.test/linux/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/.test/linux/main.test.bicep rename to modules/Compute/virtualMachines/.test/linux/main.test.bicep diff --git a/modules/Microsoft.Compute/virtualMachines/.test/windows.atmg/dependencies.bicep b/modules/Compute/virtualMachines/.test/windows.atmg/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/.test/windows.atmg/dependencies.bicep rename to modules/Compute/virtualMachines/.test/windows.atmg/dependencies.bicep diff --git a/modules/Microsoft.Compute/virtualMachines/.test/windows.atmg/main.test.bicep b/modules/Compute/virtualMachines/.test/windows.atmg/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/.test/windows.atmg/main.test.bicep rename to modules/Compute/virtualMachines/.test/windows.atmg/main.test.bicep diff --git a/modules/Microsoft.Compute/virtualMachines/.test/windows.min/dependencies.bicep b/modules/Compute/virtualMachines/.test/windows.min/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/.test/windows.min/dependencies.bicep rename to modules/Compute/virtualMachines/.test/windows.min/dependencies.bicep diff --git a/modules/Microsoft.Compute/virtualMachines/.test/windows.min/main.test.bicep b/modules/Compute/virtualMachines/.test/windows.min/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/.test/windows.min/main.test.bicep rename to modules/Compute/virtualMachines/.test/windows.min/main.test.bicep diff --git a/modules/Microsoft.Compute/virtualMachines/.test/windows.ssecmk/dependencies.bicep b/modules/Compute/virtualMachines/.test/windows.ssecmk/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/.test/windows.ssecmk/dependencies.bicep rename to modules/Compute/virtualMachines/.test/windows.ssecmk/dependencies.bicep diff --git a/modules/Microsoft.Compute/virtualMachines/.test/windows.ssecmk/main.test.bicep b/modules/Compute/virtualMachines/.test/windows.ssecmk/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/.test/windows.ssecmk/main.test.bicep rename to modules/Compute/virtualMachines/.test/windows.ssecmk/main.test.bicep diff --git a/modules/Microsoft.Compute/virtualMachines/.test/windows/dependencies.bicep b/modules/Compute/virtualMachines/.test/windows/dependencies.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/.test/windows/dependencies.bicep rename to modules/Compute/virtualMachines/.test/windows/dependencies.bicep diff --git a/modules/Microsoft.Compute/virtualMachines/.test/windows/main.test.bicep b/modules/Compute/virtualMachines/.test/windows/main.test.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/.test/windows/main.test.bicep rename to modules/Compute/virtualMachines/.test/windows/main.test.bicep diff --git a/modules/Microsoft.Compute/virtualMachines/readme.md b/modules/Compute/virtualMachines/README.md similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/readme.md rename to modules/Compute/virtualMachines/README.md diff --git a/modules/Microsoft.Compute/virtualMachines/extensions/readme.md b/modules/Compute/virtualMachines/extensions/README.md similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/extensions/readme.md rename to modules/Compute/virtualMachines/extensions/README.md diff --git a/modules/Microsoft.Compute/virtualMachines/extensions/main.bicep b/modules/Compute/virtualMachines/extensions/main.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/extensions/main.bicep rename to modules/Compute/virtualMachines/extensions/main.bicep diff --git a/modules/Microsoft.Compute/virtualMachines/extensions/version.json b/modules/Compute/virtualMachines/extensions/version.json similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/extensions/version.json rename to modules/Compute/virtualMachines/extensions/version.json diff --git a/modules/Microsoft.Compute/virtualMachines/main.bicep b/modules/Compute/virtualMachines/main.bicep similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/main.bicep rename to modules/Compute/virtualMachines/main.bicep diff --git a/modules/Microsoft.Compute/virtualMachines/version.json b/modules/Compute/virtualMachines/version.json similarity index 100% rename from modules/Microsoft.Compute/virtualMachines/version.json rename to modules/Compute/virtualMachines/version.json diff --git a/modules/Microsoft.Consumption/budgets/.test/common/main.test.bicep b/modules/Consumption/budgets/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Consumption/budgets/.test/common/main.test.bicep rename to modules/Consumption/budgets/.test/common/main.test.bicep diff --git a/modules/Microsoft.Consumption/budgets/.test/min/main.test.bicep b/modules/Consumption/budgets/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Consumption/budgets/.test/min/main.test.bicep rename to modules/Consumption/budgets/.test/min/main.test.bicep diff --git a/modules/Microsoft.Consumption/budgets/readme.md b/modules/Consumption/budgets/README.md similarity index 100% rename from modules/Microsoft.Consumption/budgets/readme.md rename to modules/Consumption/budgets/README.md diff --git a/modules/Microsoft.Consumption/budgets/main.bicep b/modules/Consumption/budgets/main.bicep similarity index 100% rename from modules/Microsoft.Consumption/budgets/main.bicep rename to modules/Consumption/budgets/main.bicep diff --git a/modules/Microsoft.Consumption/budgets/version.json b/modules/Consumption/budgets/version.json similarity index 100% rename from modules/Microsoft.Consumption/budgets/version.json rename to modules/Consumption/budgets/version.json diff --git a/modules/Microsoft.ContainerInstance/containerGroups/.test/common/dependencies.bicep b/modules/ContainerInstance/containerGroups/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.ContainerInstance/containerGroups/.test/common/dependencies.bicep rename to modules/ContainerInstance/containerGroups/.test/common/dependencies.bicep diff --git a/modules/Microsoft.ContainerInstance/containerGroups/.test/common/main.test.bicep b/modules/ContainerInstance/containerGroups/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.ContainerInstance/containerGroups/.test/common/main.test.bicep rename to modules/ContainerInstance/containerGroups/.test/common/main.test.bicep diff --git a/modules/Microsoft.ContainerInstance/containerGroups/.test/encr/dependencies.bicep b/modules/ContainerInstance/containerGroups/.test/encr/dependencies.bicep similarity index 100% rename from modules/Microsoft.ContainerInstance/containerGroups/.test/encr/dependencies.bicep rename to modules/ContainerInstance/containerGroups/.test/encr/dependencies.bicep diff --git a/modules/Microsoft.ContainerInstance/containerGroups/.test/encr/main.test.bicep b/modules/ContainerInstance/containerGroups/.test/encr/main.test.bicep similarity index 100% rename from modules/Microsoft.ContainerInstance/containerGroups/.test/encr/main.test.bicep rename to modules/ContainerInstance/containerGroups/.test/encr/main.test.bicep diff --git a/modules/Microsoft.ContainerInstance/containerGroups/.test/min/main.test.bicep b/modules/ContainerInstance/containerGroups/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.ContainerInstance/containerGroups/.test/min/main.test.bicep rename to modules/ContainerInstance/containerGroups/.test/min/main.test.bicep diff --git a/modules/Microsoft.ContainerInstance/containerGroups/.test/private/dependencies.bicep b/modules/ContainerInstance/containerGroups/.test/private/dependencies.bicep similarity index 100% rename from modules/Microsoft.ContainerInstance/containerGroups/.test/private/dependencies.bicep rename to modules/ContainerInstance/containerGroups/.test/private/dependencies.bicep diff --git a/modules/Microsoft.ContainerInstance/containerGroups/.test/private/main.test.bicep b/modules/ContainerInstance/containerGroups/.test/private/main.test.bicep similarity index 100% rename from modules/Microsoft.ContainerInstance/containerGroups/.test/private/main.test.bicep rename to modules/ContainerInstance/containerGroups/.test/private/main.test.bicep diff --git a/modules/Microsoft.ContainerInstance/containerGroups/readme.md b/modules/ContainerInstance/containerGroups/README.md similarity index 100% rename from modules/Microsoft.ContainerInstance/containerGroups/readme.md rename to modules/ContainerInstance/containerGroups/README.md diff --git a/modules/Microsoft.ContainerInstance/containerGroups/main.bicep b/modules/ContainerInstance/containerGroups/main.bicep similarity index 100% rename from modules/Microsoft.ContainerInstance/containerGroups/main.bicep rename to modules/ContainerInstance/containerGroups/main.bicep diff --git a/modules/Microsoft.ContainerInstance/containerGroups/version.json b/modules/ContainerInstance/containerGroups/version.json similarity index 100% rename from modules/Microsoft.ContainerInstance/containerGroups/version.json rename to modules/ContainerInstance/containerGroups/version.json diff --git a/modules/Microsoft.ContainerRegistry/registries/.bicep/nested_roleAssignments.bicep b/modules/ContainerRegistry/registries/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.ContainerRegistry/registries/.bicep/nested_roleAssignments.bicep rename to modules/ContainerRegistry/registries/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.ContainerRegistry/registries/.test/common/dependencies.bicep b/modules/ContainerRegistry/registries/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.ContainerRegistry/registries/.test/common/dependencies.bicep rename to modules/ContainerRegistry/registries/.test/common/dependencies.bicep diff --git a/modules/Microsoft.ContainerRegistry/registries/.test/common/main.test.bicep b/modules/ContainerRegistry/registries/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.ContainerRegistry/registries/.test/common/main.test.bicep rename to modules/ContainerRegistry/registries/.test/common/main.test.bicep diff --git a/modules/Microsoft.ContainerRegistry/registries/.test/encr/dependencies.bicep b/modules/ContainerRegistry/registries/.test/encr/dependencies.bicep similarity index 100% rename from modules/Microsoft.ContainerRegistry/registries/.test/encr/dependencies.bicep rename to modules/ContainerRegistry/registries/.test/encr/dependencies.bicep diff --git a/modules/Microsoft.ContainerRegistry/registries/.test/encr/main.test.bicep b/modules/ContainerRegistry/registries/.test/encr/main.test.bicep similarity index 100% rename from modules/Microsoft.ContainerRegistry/registries/.test/encr/main.test.bicep rename to modules/ContainerRegistry/registries/.test/encr/main.test.bicep diff --git a/modules/Microsoft.ContainerRegistry/registries/.test/min/main.test.bicep b/modules/ContainerRegistry/registries/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.ContainerRegistry/registries/.test/min/main.test.bicep rename to modules/ContainerRegistry/registries/.test/min/main.test.bicep diff --git a/modules/Microsoft.ContainerRegistry/registries/.test/pe/dependencies.bicep b/modules/ContainerRegistry/registries/.test/pe/dependencies.bicep similarity index 100% rename from modules/Microsoft.ContainerRegistry/registries/.test/pe/dependencies.bicep rename to modules/ContainerRegistry/registries/.test/pe/dependencies.bicep diff --git a/modules/Microsoft.ContainerRegistry/registries/.test/pe/main.test.bicep b/modules/ContainerRegistry/registries/.test/pe/main.test.bicep similarity index 100% rename from modules/Microsoft.ContainerRegistry/registries/.test/pe/main.test.bicep rename to modules/ContainerRegistry/registries/.test/pe/main.test.bicep diff --git a/modules/Microsoft.ContainerRegistry/registries/readme.md b/modules/ContainerRegistry/registries/README.md similarity index 100% rename from modules/Microsoft.ContainerRegistry/registries/readme.md rename to modules/ContainerRegistry/registries/README.md diff --git a/modules/Microsoft.ContainerRegistry/registries/main.bicep b/modules/ContainerRegistry/registries/main.bicep similarity index 100% rename from modules/Microsoft.ContainerRegistry/registries/main.bicep rename to modules/ContainerRegistry/registries/main.bicep diff --git a/modules/Microsoft.ContainerRegistry/registries/replications/readme.md b/modules/ContainerRegistry/registries/replications/README.md similarity index 100% rename from modules/Microsoft.ContainerRegistry/registries/replications/readme.md rename to modules/ContainerRegistry/registries/replications/README.md diff --git a/modules/Microsoft.ContainerRegistry/registries/replications/main.bicep b/modules/ContainerRegistry/registries/replications/main.bicep similarity index 100% rename from modules/Microsoft.ContainerRegistry/registries/replications/main.bicep rename to modules/ContainerRegistry/registries/replications/main.bicep diff --git a/modules/Microsoft.ContainerRegistry/registries/replications/version.json b/modules/ContainerRegistry/registries/replications/version.json similarity index 100% rename from modules/Microsoft.ContainerRegistry/registries/replications/version.json rename to modules/ContainerRegistry/registries/replications/version.json diff --git a/modules/Microsoft.ContainerRegistry/registries/version.json b/modules/ContainerRegistry/registries/version.json similarity index 100% rename from modules/Microsoft.ContainerRegistry/registries/version.json rename to modules/ContainerRegistry/registries/version.json diff --git a/modules/Microsoft.ContainerRegistry/registries/webhooks/readme.md b/modules/ContainerRegistry/registries/webhooks/README.md similarity index 100% rename from modules/Microsoft.ContainerRegistry/registries/webhooks/readme.md rename to modules/ContainerRegistry/registries/webhooks/README.md diff --git a/modules/Microsoft.ContainerRegistry/registries/webhooks/main.bicep b/modules/ContainerRegistry/registries/webhooks/main.bicep similarity index 100% rename from modules/Microsoft.ContainerRegistry/registries/webhooks/main.bicep rename to modules/ContainerRegistry/registries/webhooks/main.bicep diff --git a/modules/Microsoft.ContainerRegistry/registries/webhooks/version.json b/modules/ContainerRegistry/registries/webhooks/version.json similarity index 100% rename from modules/Microsoft.ContainerRegistry/registries/webhooks/version.json rename to modules/ContainerRegistry/registries/webhooks/version.json diff --git a/modules/Microsoft.ContainerService/managedClusters/.bicep/nested_roleAssignments.bicep b/modules/ContainerService/managedClusters/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.ContainerService/managedClusters/.bicep/nested_roleAssignments.bicep rename to modules/ContainerService/managedClusters/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.ContainerService/managedClusters/.test/azure/dependencies.bicep b/modules/ContainerService/managedClusters/.test/azure/dependencies.bicep similarity index 100% rename from modules/Microsoft.ContainerService/managedClusters/.test/azure/dependencies.bicep rename to modules/ContainerService/managedClusters/.test/azure/dependencies.bicep diff --git a/modules/Microsoft.ContainerService/managedClusters/.test/azure/main.test.bicep b/modules/ContainerService/managedClusters/.test/azure/main.test.bicep similarity index 100% rename from modules/Microsoft.ContainerService/managedClusters/.test/azure/main.test.bicep rename to modules/ContainerService/managedClusters/.test/azure/main.test.bicep diff --git a/modules/Microsoft.ContainerService/managedClusters/.test/kubenet/dependencies.bicep b/modules/ContainerService/managedClusters/.test/kubenet/dependencies.bicep similarity index 100% rename from modules/Microsoft.ContainerService/managedClusters/.test/kubenet/dependencies.bicep rename to modules/ContainerService/managedClusters/.test/kubenet/dependencies.bicep diff --git a/modules/Microsoft.ContainerService/managedClusters/.test/kubenet/main.test.bicep b/modules/ContainerService/managedClusters/.test/kubenet/main.test.bicep similarity index 100% rename from modules/Microsoft.ContainerService/managedClusters/.test/kubenet/main.test.bicep rename to modules/ContainerService/managedClusters/.test/kubenet/main.test.bicep diff --git a/modules/Microsoft.ContainerService/managedClusters/.test/min/main.test.bicep b/modules/ContainerService/managedClusters/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.ContainerService/managedClusters/.test/min/main.test.bicep rename to modules/ContainerService/managedClusters/.test/min/main.test.bicep diff --git a/modules/Microsoft.ContainerService/managedClusters/readme.md b/modules/ContainerService/managedClusters/README.md similarity index 100% rename from modules/Microsoft.ContainerService/managedClusters/readme.md rename to modules/ContainerService/managedClusters/README.md diff --git a/modules/Microsoft.ContainerService/managedClusters/agentPools/readme.md b/modules/ContainerService/managedClusters/agentPools/README.md similarity index 100% rename from modules/Microsoft.ContainerService/managedClusters/agentPools/readme.md rename to modules/ContainerService/managedClusters/agentPools/README.md diff --git a/modules/Microsoft.ContainerService/managedClusters/agentPools/main.bicep b/modules/ContainerService/managedClusters/agentPools/main.bicep similarity index 100% rename from modules/Microsoft.ContainerService/managedClusters/agentPools/main.bicep rename to modules/ContainerService/managedClusters/agentPools/main.bicep diff --git a/modules/Microsoft.ContainerService/managedClusters/agentPools/version.json b/modules/ContainerService/managedClusters/agentPools/version.json similarity index 100% rename from modules/Microsoft.ContainerService/managedClusters/agentPools/version.json rename to modules/ContainerService/managedClusters/agentPools/version.json diff --git a/modules/Microsoft.ContainerService/managedClusters/main.bicep b/modules/ContainerService/managedClusters/main.bicep similarity index 100% rename from modules/Microsoft.ContainerService/managedClusters/main.bicep rename to modules/ContainerService/managedClusters/main.bicep diff --git a/modules/Microsoft.ContainerService/managedClusters/version.json b/modules/ContainerService/managedClusters/version.json similarity index 100% rename from modules/Microsoft.ContainerService/managedClusters/version.json rename to modules/ContainerService/managedClusters/version.json diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/.bicep/nested_roleAssignments.bicep b/modules/DBforMySQL/flexibleServers/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.DBforMySQL/flexibleServers/.bicep/nested_roleAssignments.bicep rename to modules/DBforMySQL/flexibleServers/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/.test/min/main.test.bicep b/modules/DBforMySQL/flexibleServers/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.DBforMySQL/flexibleServers/.test/min/main.test.bicep rename to modules/DBforMySQL/flexibleServers/.test/min/main.test.bicep diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/.test/private/dependencies.bicep b/modules/DBforMySQL/flexibleServers/.test/private/dependencies.bicep similarity index 100% rename from modules/Microsoft.DBforMySQL/flexibleServers/.test/private/dependencies.bicep rename to modules/DBforMySQL/flexibleServers/.test/private/dependencies.bicep diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/.test/private/main.test.bicep b/modules/DBforMySQL/flexibleServers/.test/private/main.test.bicep similarity index 100% rename from modules/Microsoft.DBforMySQL/flexibleServers/.test/private/main.test.bicep rename to modules/DBforMySQL/flexibleServers/.test/private/main.test.bicep diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/.test/public/dependencies1.bicep b/modules/DBforMySQL/flexibleServers/.test/public/dependencies1.bicep similarity index 100% rename from modules/Microsoft.DBforMySQL/flexibleServers/.test/public/dependencies1.bicep rename to modules/DBforMySQL/flexibleServers/.test/public/dependencies1.bicep diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/.test/public/dependencies2.bicep b/modules/DBforMySQL/flexibleServers/.test/public/dependencies2.bicep similarity index 100% rename from modules/Microsoft.DBforMySQL/flexibleServers/.test/public/dependencies2.bicep rename to modules/DBforMySQL/flexibleServers/.test/public/dependencies2.bicep diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/.test/public/main.test.bicep b/modules/DBforMySQL/flexibleServers/.test/public/main.test.bicep similarity index 100% rename from modules/Microsoft.DBforMySQL/flexibleServers/.test/public/main.test.bicep rename to modules/DBforMySQL/flexibleServers/.test/public/main.test.bicep diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/readme.md b/modules/DBforMySQL/flexibleServers/README.md similarity index 100% rename from modules/Microsoft.DBforMySQL/flexibleServers/readme.md rename to modules/DBforMySQL/flexibleServers/README.md diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/databases/readme.md b/modules/DBforMySQL/flexibleServers/databases/README.md similarity index 100% rename from modules/Microsoft.DBforMySQL/flexibleServers/databases/readme.md rename to modules/DBforMySQL/flexibleServers/databases/README.md diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/databases/main.bicep b/modules/DBforMySQL/flexibleServers/databases/main.bicep similarity index 100% rename from modules/Microsoft.DBforMySQL/flexibleServers/databases/main.bicep rename to modules/DBforMySQL/flexibleServers/databases/main.bicep diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/databases/version.json b/modules/DBforMySQL/flexibleServers/databases/version.json similarity index 100% rename from modules/Microsoft.DBforMySQL/flexibleServers/databases/version.json rename to modules/DBforMySQL/flexibleServers/databases/version.json diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/firewallRules/readme.md b/modules/DBforMySQL/flexibleServers/firewallRules/README.md similarity index 100% rename from modules/Microsoft.DBforMySQL/flexibleServers/firewallRules/readme.md rename to modules/DBforMySQL/flexibleServers/firewallRules/README.md diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/firewallRules/main.bicep b/modules/DBforMySQL/flexibleServers/firewallRules/main.bicep similarity index 100% rename from modules/Microsoft.DBforMySQL/flexibleServers/firewallRules/main.bicep rename to modules/DBforMySQL/flexibleServers/firewallRules/main.bicep diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/firewallRules/version.json b/modules/DBforMySQL/flexibleServers/firewallRules/version.json similarity index 100% rename from modules/Microsoft.DBforMySQL/flexibleServers/firewallRules/version.json rename to modules/DBforMySQL/flexibleServers/firewallRules/version.json diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/main.bicep b/modules/DBforMySQL/flexibleServers/main.bicep similarity index 100% rename from modules/Microsoft.DBforMySQL/flexibleServers/main.bicep rename to modules/DBforMySQL/flexibleServers/main.bicep diff --git a/modules/Microsoft.DBforMySQL/flexibleServers/version.json b/modules/DBforMySQL/flexibleServers/version.json similarity index 100% rename from modules/Microsoft.DBforMySQL/flexibleServers/version.json rename to modules/DBforMySQL/flexibleServers/version.json diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/.bicep/nested_roleAssignments.bicep b/modules/DBforPostgreSQL/flexibleServers/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/.bicep/nested_roleAssignments.bicep rename to modules/DBforPostgreSQL/flexibleServers/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/min/main.test.bicep b/modules/DBforPostgreSQL/flexibleServers/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/min/main.test.bicep rename to modules/DBforPostgreSQL/flexibleServers/.test/min/main.test.bicep diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/private/dependencies.bicep b/modules/DBforPostgreSQL/flexibleServers/.test/private/dependencies.bicep similarity index 100% rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/private/dependencies.bicep rename to modules/DBforPostgreSQL/flexibleServers/.test/private/dependencies.bicep diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/private/main.test.bicep b/modules/DBforPostgreSQL/flexibleServers/.test/private/main.test.bicep similarity index 100% rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/private/main.test.bicep rename to modules/DBforPostgreSQL/flexibleServers/.test/private/main.test.bicep diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/public/dependencies.bicep b/modules/DBforPostgreSQL/flexibleServers/.test/public/dependencies.bicep similarity index 100% rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/public/dependencies.bicep rename to modules/DBforPostgreSQL/flexibleServers/.test/public/dependencies.bicep diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/public/main.test.bicep b/modules/DBforPostgreSQL/flexibleServers/.test/public/main.test.bicep similarity index 100% rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/.test/public/main.test.bicep rename to modules/DBforPostgreSQL/flexibleServers/.test/public/main.test.bicep diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/readme.md b/modules/DBforPostgreSQL/flexibleServers/README.md similarity index 100% rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/readme.md rename to modules/DBforPostgreSQL/flexibleServers/README.md diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/configurations/readme.md b/modules/DBforPostgreSQL/flexibleServers/configurations/README.md similarity index 100% rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/configurations/readme.md rename to modules/DBforPostgreSQL/flexibleServers/configurations/README.md diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/configurations/main.bicep b/modules/DBforPostgreSQL/flexibleServers/configurations/main.bicep similarity index 100% rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/configurations/main.bicep rename to modules/DBforPostgreSQL/flexibleServers/configurations/main.bicep diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/configurations/version.json b/modules/DBforPostgreSQL/flexibleServers/configurations/version.json similarity index 100% rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/configurations/version.json rename to modules/DBforPostgreSQL/flexibleServers/configurations/version.json diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/databases/readme.md b/modules/DBforPostgreSQL/flexibleServers/databases/README.md similarity index 100% rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/databases/readme.md rename to modules/DBforPostgreSQL/flexibleServers/databases/README.md diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/databases/main.bicep b/modules/DBforPostgreSQL/flexibleServers/databases/main.bicep similarity index 100% rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/databases/main.bicep rename to modules/DBforPostgreSQL/flexibleServers/databases/main.bicep diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/databases/version.json b/modules/DBforPostgreSQL/flexibleServers/databases/version.json similarity index 100% rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/databases/version.json rename to modules/DBforPostgreSQL/flexibleServers/databases/version.json diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/firewallRules/readme.md b/modules/DBforPostgreSQL/flexibleServers/firewallRules/README.md similarity index 100% rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/firewallRules/readme.md rename to modules/DBforPostgreSQL/flexibleServers/firewallRules/README.md diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/firewallRules/main.bicep b/modules/DBforPostgreSQL/flexibleServers/firewallRules/main.bicep similarity index 100% rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/firewallRules/main.bicep rename to modules/DBforPostgreSQL/flexibleServers/firewallRules/main.bicep diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/firewallRules/version.json b/modules/DBforPostgreSQL/flexibleServers/firewallRules/version.json similarity index 100% rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/firewallRules/version.json rename to modules/DBforPostgreSQL/flexibleServers/firewallRules/version.json diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/main.bicep b/modules/DBforPostgreSQL/flexibleServers/main.bicep similarity index 100% rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/main.bicep rename to modules/DBforPostgreSQL/flexibleServers/main.bicep diff --git a/modules/Microsoft.DBforPostgreSQL/flexibleServers/version.json b/modules/DBforPostgreSQL/flexibleServers/version.json similarity index 100% rename from modules/Microsoft.DBforPostgreSQL/flexibleServers/version.json rename to modules/DBforPostgreSQL/flexibleServers/version.json diff --git a/modules/Microsoft.DataFactory/factories/.bicep/nested_roleAssignments.bicep b/modules/DataFactory/factories/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.DataFactory/factories/.bicep/nested_roleAssignments.bicep rename to modules/DataFactory/factories/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.DataFactory/factories/.test/common/dependencies.bicep b/modules/DataFactory/factories/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.DataFactory/factories/.test/common/dependencies.bicep rename to modules/DataFactory/factories/.test/common/dependencies.bicep diff --git a/modules/Microsoft.DataFactory/factories/.test/common/main.test.bicep b/modules/DataFactory/factories/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.DataFactory/factories/.test/common/main.test.bicep rename to modules/DataFactory/factories/.test/common/main.test.bicep diff --git a/modules/Microsoft.DataFactory/factories/.test/min/main.test.bicep b/modules/DataFactory/factories/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.DataFactory/factories/.test/min/main.test.bicep rename to modules/DataFactory/factories/.test/min/main.test.bicep diff --git a/modules/Microsoft.DataFactory/factories/readme.md b/modules/DataFactory/factories/README.md similarity index 100% rename from modules/Microsoft.DataFactory/factories/readme.md rename to modules/DataFactory/factories/README.md diff --git a/modules/Microsoft.DataFactory/factories/integrationRuntimes/readme.md b/modules/DataFactory/factories/integrationRuntimes/README.md similarity index 100% rename from modules/Microsoft.DataFactory/factories/integrationRuntimes/readme.md rename to modules/DataFactory/factories/integrationRuntimes/README.md diff --git a/modules/Microsoft.DataFactory/factories/integrationRuntimes/main.bicep b/modules/DataFactory/factories/integrationRuntimes/main.bicep similarity index 100% rename from modules/Microsoft.DataFactory/factories/integrationRuntimes/main.bicep rename to modules/DataFactory/factories/integrationRuntimes/main.bicep diff --git a/modules/Microsoft.DataFactory/factories/integrationRuntimes/version.json b/modules/DataFactory/factories/integrationRuntimes/version.json similarity index 100% rename from modules/Microsoft.DataFactory/factories/integrationRuntimes/version.json rename to modules/DataFactory/factories/integrationRuntimes/version.json diff --git a/modules/Microsoft.DataFactory/factories/main.bicep b/modules/DataFactory/factories/main.bicep similarity index 100% rename from modules/Microsoft.DataFactory/factories/main.bicep rename to modules/DataFactory/factories/main.bicep diff --git a/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/readme.md b/modules/DataFactory/factories/managedVirtualNetworks/README.md similarity index 100% rename from modules/Microsoft.DataFactory/factories/managedVirtualNetworks/readme.md rename to modules/DataFactory/factories/managedVirtualNetworks/README.md diff --git a/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/main.bicep b/modules/DataFactory/factories/managedVirtualNetworks/main.bicep similarity index 100% rename from modules/Microsoft.DataFactory/factories/managedVirtualNetworks/main.bicep rename to modules/DataFactory/factories/managedVirtualNetworks/main.bicep diff --git a/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/readme.md b/modules/DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/README.md similarity index 100% rename from modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/readme.md rename to modules/DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/README.md diff --git a/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/main.bicep b/modules/DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/main.bicep similarity index 100% rename from modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/main.bicep rename to modules/DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/main.bicep diff --git a/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/version.json b/modules/DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/version.json similarity index 100% rename from modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/version.json rename to modules/DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/version.json diff --git a/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/version.json b/modules/DataFactory/factories/managedVirtualNetworks/version.json similarity index 100% rename from modules/Microsoft.DataFactory/factories/managedVirtualNetworks/version.json rename to modules/DataFactory/factories/managedVirtualNetworks/version.json diff --git a/modules/Microsoft.DataFactory/factories/version.json b/modules/DataFactory/factories/version.json similarity index 100% rename from modules/Microsoft.DataFactory/factories/version.json rename to modules/DataFactory/factories/version.json diff --git a/modules/Microsoft.DataProtection/backupVaults/.bicep/nested_roleAssignments.bicep b/modules/DataProtection/backupVaults/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.DataProtection/backupVaults/.bicep/nested_roleAssignments.bicep rename to modules/DataProtection/backupVaults/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.DataProtection/backupVaults/.test/common/dependencies.bicep b/modules/DataProtection/backupVaults/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.DataProtection/backupVaults/.test/common/dependencies.bicep rename to modules/DataProtection/backupVaults/.test/common/dependencies.bicep diff --git a/modules/Microsoft.DataProtection/backupVaults/.test/common/main.test.bicep b/modules/DataProtection/backupVaults/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.DataProtection/backupVaults/.test/common/main.test.bicep rename to modules/DataProtection/backupVaults/.test/common/main.test.bicep diff --git a/modules/Microsoft.DataProtection/backupVaults/.test/min/main.test.bicep b/modules/DataProtection/backupVaults/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.DataProtection/backupVaults/.test/min/main.test.bicep rename to modules/DataProtection/backupVaults/.test/min/main.test.bicep diff --git a/modules/Microsoft.DataProtection/backupVaults/readme.md b/modules/DataProtection/backupVaults/README.md similarity index 100% rename from modules/Microsoft.DataProtection/backupVaults/readme.md rename to modules/DataProtection/backupVaults/README.md diff --git a/modules/Microsoft.DataProtection/backupVaults/backupPolicies/readme.md b/modules/DataProtection/backupVaults/backupPolicies/README.md similarity index 100% rename from modules/Microsoft.DataProtection/backupVaults/backupPolicies/readme.md rename to modules/DataProtection/backupVaults/backupPolicies/README.md diff --git a/modules/Microsoft.DataProtection/backupVaults/backupPolicies/main.bicep b/modules/DataProtection/backupVaults/backupPolicies/main.bicep similarity index 100% rename from modules/Microsoft.DataProtection/backupVaults/backupPolicies/main.bicep rename to modules/DataProtection/backupVaults/backupPolicies/main.bicep diff --git a/modules/Microsoft.DataProtection/backupVaults/backupPolicies/version.json b/modules/DataProtection/backupVaults/backupPolicies/version.json similarity index 100% rename from modules/Microsoft.DataProtection/backupVaults/backupPolicies/version.json rename to modules/DataProtection/backupVaults/backupPolicies/version.json diff --git a/modules/Microsoft.DataProtection/backupVaults/main.bicep b/modules/DataProtection/backupVaults/main.bicep similarity index 100% rename from modules/Microsoft.DataProtection/backupVaults/main.bicep rename to modules/DataProtection/backupVaults/main.bicep diff --git a/modules/Microsoft.DataProtection/backupVaults/version.json b/modules/DataProtection/backupVaults/version.json similarity index 100% rename from modules/Microsoft.DataProtection/backupVaults/version.json rename to modules/DataProtection/backupVaults/version.json diff --git a/modules/Microsoft.Databricks/workspaces/.bicep/nested_roleAssignments.bicep b/modules/Databricks/workspaces/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Databricks/workspaces/.bicep/nested_roleAssignments.bicep rename to modules/Databricks/workspaces/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Databricks/workspaces/.test/common/dependencies.bicep b/modules/Databricks/workspaces/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Databricks/workspaces/.test/common/dependencies.bicep rename to modules/Databricks/workspaces/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Databricks/workspaces/.test/common/main.test.bicep b/modules/Databricks/workspaces/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Databricks/workspaces/.test/common/main.test.bicep rename to modules/Databricks/workspaces/.test/common/main.test.bicep diff --git a/modules/Microsoft.Databricks/workspaces/readme.md b/modules/Databricks/workspaces/README.md similarity index 100% rename from modules/Microsoft.Databricks/workspaces/readme.md rename to modules/Databricks/workspaces/README.md diff --git a/modules/Microsoft.Databricks/workspaces/main.bicep b/modules/Databricks/workspaces/main.bicep similarity index 100% rename from modules/Microsoft.Databricks/workspaces/main.bicep rename to modules/Databricks/workspaces/main.bicep diff --git a/modules/Microsoft.Databricks/workspaces/version.json b/modules/Databricks/workspaces/version.json similarity index 100% rename from modules/Microsoft.Databricks/workspaces/version.json rename to modules/Databricks/workspaces/version.json diff --git a/modules/Microsoft.DevTestLab/labs/.bicep/nested_roleAssignments.bicep b/modules/DevTestLab/labs/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.DevTestLab/labs/.bicep/nested_roleAssignments.bicep rename to modules/DevTestLab/labs/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.DevTestLab/labs/.test/common/dependencies.bicep b/modules/DevTestLab/labs/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.DevTestLab/labs/.test/common/dependencies.bicep rename to modules/DevTestLab/labs/.test/common/dependencies.bicep diff --git a/modules/Microsoft.DevTestLab/labs/.test/common/main.test.bicep b/modules/DevTestLab/labs/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.DevTestLab/labs/.test/common/main.test.bicep rename to modules/DevTestLab/labs/.test/common/main.test.bicep diff --git a/modules/Microsoft.DevTestLab/labs/.test/min/main.test.bicep b/modules/DevTestLab/labs/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.DevTestLab/labs/.test/min/main.test.bicep rename to modules/DevTestLab/labs/.test/min/main.test.bicep diff --git a/modules/Microsoft.DevTestLab/labs/readme.md b/modules/DevTestLab/labs/README.md similarity index 100% rename from modules/Microsoft.DevTestLab/labs/readme.md rename to modules/DevTestLab/labs/README.md diff --git a/modules/Microsoft.DevTestLab/labs/artifactSources/readme.md b/modules/DevTestLab/labs/artifactSources/README.md similarity index 100% rename from modules/Microsoft.DevTestLab/labs/artifactSources/readme.md rename to modules/DevTestLab/labs/artifactSources/README.md diff --git a/modules/Microsoft.DevTestLab/labs/artifactSources/main.bicep b/modules/DevTestLab/labs/artifactSources/main.bicep similarity index 100% rename from modules/Microsoft.DevTestLab/labs/artifactSources/main.bicep rename to modules/DevTestLab/labs/artifactSources/main.bicep diff --git a/modules/Microsoft.DevTestLab/labs/artifactSources/version.json b/modules/DevTestLab/labs/artifactSources/version.json similarity index 100% rename from modules/Microsoft.DevTestLab/labs/artifactSources/version.json rename to modules/DevTestLab/labs/artifactSources/version.json diff --git a/modules/Microsoft.DevTestLab/labs/costs/readme.md b/modules/DevTestLab/labs/costs/README.md similarity index 100% rename from modules/Microsoft.DevTestLab/labs/costs/readme.md rename to modules/DevTestLab/labs/costs/README.md diff --git a/modules/Microsoft.DevTestLab/labs/costs/main.bicep b/modules/DevTestLab/labs/costs/main.bicep similarity index 100% rename from modules/Microsoft.DevTestLab/labs/costs/main.bicep rename to modules/DevTestLab/labs/costs/main.bicep diff --git a/modules/Microsoft.DevTestLab/labs/costs/version.json b/modules/DevTestLab/labs/costs/version.json similarity index 100% rename from modules/Microsoft.DevTestLab/labs/costs/version.json rename to modules/DevTestLab/labs/costs/version.json diff --git a/modules/Microsoft.DevTestLab/labs/main.bicep b/modules/DevTestLab/labs/main.bicep similarity index 100% rename from modules/Microsoft.DevTestLab/labs/main.bicep rename to modules/DevTestLab/labs/main.bicep diff --git a/modules/Microsoft.DevTestLab/labs/notificationChannels/readme.md b/modules/DevTestLab/labs/notificationChannels/README.md similarity index 100% rename from modules/Microsoft.DevTestLab/labs/notificationChannels/readme.md rename to modules/DevTestLab/labs/notificationChannels/README.md diff --git a/modules/Microsoft.DevTestLab/labs/notificationChannels/main.bicep b/modules/DevTestLab/labs/notificationChannels/main.bicep similarity index 100% rename from modules/Microsoft.DevTestLab/labs/notificationChannels/main.bicep rename to modules/DevTestLab/labs/notificationChannels/main.bicep diff --git a/modules/Microsoft.DevTestLab/labs/notificationChannels/version.json b/modules/DevTestLab/labs/notificationChannels/version.json similarity index 100% rename from modules/Microsoft.DevTestLab/labs/notificationChannels/version.json rename to modules/DevTestLab/labs/notificationChannels/version.json diff --git a/modules/Microsoft.DevTestLab/labs/policySets/policies/readme.md b/modules/DevTestLab/labs/policySets/policies/README.md similarity index 100% rename from modules/Microsoft.DevTestLab/labs/policySets/policies/readme.md rename to modules/DevTestLab/labs/policySets/policies/README.md diff --git a/modules/Microsoft.DevTestLab/labs/policySets/policies/main.bicep b/modules/DevTestLab/labs/policySets/policies/main.bicep similarity index 100% rename from modules/Microsoft.DevTestLab/labs/policySets/policies/main.bicep rename to modules/DevTestLab/labs/policySets/policies/main.bicep diff --git a/modules/Microsoft.DevTestLab/labs/policySets/policies/version.json b/modules/DevTestLab/labs/policySets/policies/version.json similarity index 100% rename from modules/Microsoft.DevTestLab/labs/policySets/policies/version.json rename to modules/DevTestLab/labs/policySets/policies/version.json diff --git a/modules/Microsoft.DevTestLab/labs/schedules/readme.md b/modules/DevTestLab/labs/schedules/README.md similarity index 100% rename from modules/Microsoft.DevTestLab/labs/schedules/readme.md rename to modules/DevTestLab/labs/schedules/README.md diff --git a/modules/Microsoft.DevTestLab/labs/schedules/main.bicep b/modules/DevTestLab/labs/schedules/main.bicep similarity index 100% rename from modules/Microsoft.DevTestLab/labs/schedules/main.bicep rename to modules/DevTestLab/labs/schedules/main.bicep diff --git a/modules/Microsoft.DevTestLab/labs/schedules/version.json b/modules/DevTestLab/labs/schedules/version.json similarity index 100% rename from modules/Microsoft.DevTestLab/labs/schedules/version.json rename to modules/DevTestLab/labs/schedules/version.json diff --git a/modules/Microsoft.DevTestLab/labs/version.json b/modules/DevTestLab/labs/version.json similarity index 100% rename from modules/Microsoft.DevTestLab/labs/version.json rename to modules/DevTestLab/labs/version.json diff --git a/modules/Microsoft.DevTestLab/labs/virtualNetworks/readme.md b/modules/DevTestLab/labs/virtualNetworks/README.md similarity index 100% rename from modules/Microsoft.DevTestLab/labs/virtualNetworks/readme.md rename to modules/DevTestLab/labs/virtualNetworks/README.md diff --git a/modules/Microsoft.DevTestLab/labs/virtualNetworks/main.bicep b/modules/DevTestLab/labs/virtualNetworks/main.bicep similarity index 100% rename from modules/Microsoft.DevTestLab/labs/virtualNetworks/main.bicep rename to modules/DevTestLab/labs/virtualNetworks/main.bicep diff --git a/modules/Microsoft.DevTestLab/labs/virtualNetworks/version.json b/modules/DevTestLab/labs/virtualNetworks/version.json similarity index 100% rename from modules/Microsoft.DevTestLab/labs/virtualNetworks/version.json rename to modules/DevTestLab/labs/virtualNetworks/version.json diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/.bicep/nested_roleAssignments.bicep b/modules/DigitalTwins/digitalTwinsInstances/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/.bicep/nested_roleAssignments.bicep rename to modules/DigitalTwins/digitalTwinsInstances/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/.test/common/dependencies.bicep b/modules/DigitalTwins/digitalTwinsInstances/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/.test/common/dependencies.bicep rename to modules/DigitalTwins/digitalTwinsInstances/.test/common/dependencies.bicep diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/.test/common/main.test.bicep b/modules/DigitalTwins/digitalTwinsInstances/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/.test/common/main.test.bicep rename to modules/DigitalTwins/digitalTwinsInstances/.test/common/main.test.bicep diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/.test/min/main.test.bicep b/modules/DigitalTwins/digitalTwinsInstances/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/.test/min/main.test.bicep rename to modules/DigitalTwins/digitalTwinsInstances/.test/min/main.test.bicep diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/readme.md b/modules/DigitalTwins/digitalTwinsInstances/README.md similarity index 100% rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/readme.md rename to modules/DigitalTwins/digitalTwinsInstances/README.md diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/readme.md b/modules/DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/README.md similarity index 100% rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/readme.md rename to modules/DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/README.md diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/main.bicep b/modules/DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/main.bicep similarity index 100% rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/main.bicep rename to modules/DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/main.bicep diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/version.json b/modules/DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/version.json similarity index 100% rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/version.json rename to modules/DigitalTwins/digitalTwinsInstances/endpoints-eventGrid/version.json diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventHub/readme.md b/modules/DigitalTwins/digitalTwinsInstances/endpoints-eventHub/README.md similarity index 100% rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventHub/readme.md rename to modules/DigitalTwins/digitalTwinsInstances/endpoints-eventHub/README.md diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventHub/main.bicep b/modules/DigitalTwins/digitalTwinsInstances/endpoints-eventHub/main.bicep similarity index 100% rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventHub/main.bicep rename to modules/DigitalTwins/digitalTwinsInstances/endpoints-eventHub/main.bicep diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventHub/version.json b/modules/DigitalTwins/digitalTwinsInstances/endpoints-eventHub/version.json similarity index 100% rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-eventHub/version.json rename to modules/DigitalTwins/digitalTwinsInstances/endpoints-eventHub/version.json diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/readme.md b/modules/DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/README.md similarity index 100% rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/readme.md rename to modules/DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/README.md diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/main.bicep b/modules/DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/main.bicep similarity index 100% rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/main.bicep rename to modules/DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/main.bicep diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/version.json b/modules/DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/version.json similarity index 100% rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/version.json rename to modules/DigitalTwins/digitalTwinsInstances/endpoints-serviceBus/version.json diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/main.bicep b/modules/DigitalTwins/digitalTwinsInstances/main.bicep similarity index 100% rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/main.bicep rename to modules/DigitalTwins/digitalTwinsInstances/main.bicep diff --git a/modules/Microsoft.DigitalTwins/digitalTwinsInstances/version.json b/modules/DigitalTwins/digitalTwinsInstances/version.json similarity index 100% rename from modules/Microsoft.DigitalTwins/digitalTwinsInstances/version.json rename to modules/DigitalTwins/digitalTwinsInstances/version.json diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.bicep/nested_roleAssignments.bicep b/modules/DocumentDB/databaseAccounts/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/.bicep/nested_roleAssignments.bicep rename to modules/DocumentDB/databaseAccounts/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.test/gremlindb/dependencies.bicep b/modules/DocumentDB/databaseAccounts/.test/gremlindb/dependencies.bicep similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/.test/gremlindb/dependencies.bicep rename to modules/DocumentDB/databaseAccounts/.test/gremlindb/dependencies.bicep diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.test/gremlindb/main.test.bicep b/modules/DocumentDB/databaseAccounts/.test/gremlindb/main.test.bicep similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/.test/gremlindb/main.test.bicep rename to modules/DocumentDB/databaseAccounts/.test/gremlindb/main.test.bicep diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.test/mongodb/dependencies.bicep b/modules/DocumentDB/databaseAccounts/.test/mongodb/dependencies.bicep similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/.test/mongodb/dependencies.bicep rename to modules/DocumentDB/databaseAccounts/.test/mongodb/dependencies.bicep diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.test/mongodb/main.test.bicep b/modules/DocumentDB/databaseAccounts/.test/mongodb/main.test.bicep similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/.test/mongodb/main.test.bicep rename to modules/DocumentDB/databaseAccounts/.test/mongodb/main.test.bicep diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.test/plain/dependencies.bicep b/modules/DocumentDB/databaseAccounts/.test/plain/dependencies.bicep similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/.test/plain/dependencies.bicep rename to modules/DocumentDB/databaseAccounts/.test/plain/dependencies.bicep diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.test/plain/main.test.bicep b/modules/DocumentDB/databaseAccounts/.test/plain/main.test.bicep similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/.test/plain/main.test.bicep rename to modules/DocumentDB/databaseAccounts/.test/plain/main.test.bicep diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.test/sqldb/dependencies.bicep b/modules/DocumentDB/databaseAccounts/.test/sqldb/dependencies.bicep similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/.test/sqldb/dependencies.bicep rename to modules/DocumentDB/databaseAccounts/.test/sqldb/dependencies.bicep diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/.test/sqldb/main.test.bicep b/modules/DocumentDB/databaseAccounts/.test/sqldb/main.test.bicep similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/.test/sqldb/main.test.bicep rename to modules/DocumentDB/databaseAccounts/.test/sqldb/main.test.bicep diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/readme.md b/modules/DocumentDB/databaseAccounts/README.md similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/readme.md rename to modules/DocumentDB/databaseAccounts/README.md diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/readme.md b/modules/DocumentDB/databaseAccounts/gremlinDatabases/README.md similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/readme.md rename to modules/DocumentDB/databaseAccounts/gremlinDatabases/README.md diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/graphs/readme.md b/modules/DocumentDB/databaseAccounts/gremlinDatabases/graphs/README.md similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/graphs/readme.md rename to modules/DocumentDB/databaseAccounts/gremlinDatabases/graphs/README.md diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/graphs/main.bicep b/modules/DocumentDB/databaseAccounts/gremlinDatabases/graphs/main.bicep similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/graphs/main.bicep rename to modules/DocumentDB/databaseAccounts/gremlinDatabases/graphs/main.bicep diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/graphs/version.json b/modules/DocumentDB/databaseAccounts/gremlinDatabases/graphs/version.json similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/graphs/version.json rename to modules/DocumentDB/databaseAccounts/gremlinDatabases/graphs/version.json diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/main.bicep b/modules/DocumentDB/databaseAccounts/gremlinDatabases/main.bicep similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/main.bicep rename to modules/DocumentDB/databaseAccounts/gremlinDatabases/main.bicep diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/version.json b/modules/DocumentDB/databaseAccounts/gremlinDatabases/version.json similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/version.json rename to modules/DocumentDB/databaseAccounts/gremlinDatabases/version.json diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/main.bicep b/modules/DocumentDB/databaseAccounts/main.bicep similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/main.bicep rename to modules/DocumentDB/databaseAccounts/main.bicep diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/readme.md b/modules/DocumentDB/databaseAccounts/mongodbDatabases/README.md similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/readme.md rename to modules/DocumentDB/databaseAccounts/mongodbDatabases/README.md diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/readme.md b/modules/DocumentDB/databaseAccounts/mongodbDatabases/collections/README.md similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/readme.md rename to modules/DocumentDB/databaseAccounts/mongodbDatabases/collections/README.md diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/main.bicep b/modules/DocumentDB/databaseAccounts/mongodbDatabases/collections/main.bicep similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/main.bicep rename to modules/DocumentDB/databaseAccounts/mongodbDatabases/collections/main.bicep diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json b/modules/DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json rename to modules/DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/main.bicep b/modules/DocumentDB/databaseAccounts/mongodbDatabases/main.bicep similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/main.bicep rename to modules/DocumentDB/databaseAccounts/mongodbDatabases/main.bicep diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json b/modules/DocumentDB/databaseAccounts/mongodbDatabases/version.json similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json rename to modules/DocumentDB/databaseAccounts/mongodbDatabases/version.json diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/readme.md b/modules/DocumentDB/databaseAccounts/sqlDatabases/README.md similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/readme.md rename to modules/DocumentDB/databaseAccounts/sqlDatabases/README.md diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readme.md b/modules/DocumentDB/databaseAccounts/sqlDatabases/containers/README.md similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readme.md rename to modules/DocumentDB/databaseAccounts/sqlDatabases/containers/README.md diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/main.bicep b/modules/DocumentDB/databaseAccounts/sqlDatabases/containers/main.bicep similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/main.bicep rename to modules/DocumentDB/databaseAccounts/sqlDatabases/containers/main.bicep diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json b/modules/DocumentDB/databaseAccounts/sqlDatabases/containers/version.json similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json rename to modules/DocumentDB/databaseAccounts/sqlDatabases/containers/version.json diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/main.bicep b/modules/DocumentDB/databaseAccounts/sqlDatabases/main.bicep similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/main.bicep rename to modules/DocumentDB/databaseAccounts/sqlDatabases/main.bicep diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json b/modules/DocumentDB/databaseAccounts/sqlDatabases/version.json similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json rename to modules/DocumentDB/databaseAccounts/sqlDatabases/version.json diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/version.json b/modules/DocumentDB/databaseAccounts/version.json similarity index 100% rename from modules/Microsoft.DocumentDB/databaseAccounts/version.json rename to modules/DocumentDB/databaseAccounts/version.json diff --git a/modules/Microsoft.EventGrid/domains/.bicep/nested_roleAssignments.bicep b/modules/EventGrid/domains/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.EventGrid/domains/.bicep/nested_roleAssignments.bicep rename to modules/EventGrid/domains/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.EventGrid/domains/.test/common/dependencies.bicep b/modules/EventGrid/domains/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.EventGrid/domains/.test/common/dependencies.bicep rename to modules/EventGrid/domains/.test/common/dependencies.bicep diff --git a/modules/Microsoft.EventGrid/domains/.test/common/main.test.bicep b/modules/EventGrid/domains/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.EventGrid/domains/.test/common/main.test.bicep rename to modules/EventGrid/domains/.test/common/main.test.bicep diff --git a/modules/Microsoft.EventGrid/domains/.test/min/main.test.bicep b/modules/EventGrid/domains/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.EventGrid/domains/.test/min/main.test.bicep rename to modules/EventGrid/domains/.test/min/main.test.bicep diff --git a/modules/Microsoft.EventGrid/domains/.test/pe/dependencies.bicep b/modules/EventGrid/domains/.test/pe/dependencies.bicep similarity index 100% rename from modules/Microsoft.EventGrid/domains/.test/pe/dependencies.bicep rename to modules/EventGrid/domains/.test/pe/dependencies.bicep diff --git a/modules/Microsoft.EventGrid/domains/.test/pe/main.test.bicep b/modules/EventGrid/domains/.test/pe/main.test.bicep similarity index 100% rename from modules/Microsoft.EventGrid/domains/.test/pe/main.test.bicep rename to modules/EventGrid/domains/.test/pe/main.test.bicep diff --git a/modules/Microsoft.EventGrid/domains/readme.md b/modules/EventGrid/domains/README.md similarity index 100% rename from modules/Microsoft.EventGrid/domains/readme.md rename to modules/EventGrid/domains/README.md diff --git a/modules/Microsoft.EventGrid/domains/main.bicep b/modules/EventGrid/domains/main.bicep similarity index 100% rename from modules/Microsoft.EventGrid/domains/main.bicep rename to modules/EventGrid/domains/main.bicep diff --git a/modules/Microsoft.EventGrid/domains/topics/readme.md b/modules/EventGrid/domains/topics/README.md similarity index 100% rename from modules/Microsoft.EventGrid/domains/topics/readme.md rename to modules/EventGrid/domains/topics/README.md diff --git a/modules/Microsoft.EventGrid/domains/topics/main.bicep b/modules/EventGrid/domains/topics/main.bicep similarity index 100% rename from modules/Microsoft.EventGrid/domains/topics/main.bicep rename to modules/EventGrid/domains/topics/main.bicep diff --git a/modules/Microsoft.EventGrid/domains/topics/version.json b/modules/EventGrid/domains/topics/version.json similarity index 100% rename from modules/Microsoft.EventGrid/domains/topics/version.json rename to modules/EventGrid/domains/topics/version.json diff --git a/modules/Microsoft.EventGrid/domains/version.json b/modules/EventGrid/domains/version.json similarity index 100% rename from modules/Microsoft.EventGrid/domains/version.json rename to modules/EventGrid/domains/version.json diff --git a/modules/Microsoft.EventGrid/eventSubscriptions/.test/common/dependencies.bicep b/modules/EventGrid/eventSubscriptions/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.EventGrid/eventSubscriptions/.test/common/dependencies.bicep rename to modules/EventGrid/eventSubscriptions/.test/common/dependencies.bicep diff --git a/modules/Microsoft.EventGrid/eventSubscriptions/.test/common/main.test.bicep b/modules/EventGrid/eventSubscriptions/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.EventGrid/eventSubscriptions/.test/common/main.test.bicep rename to modules/EventGrid/eventSubscriptions/.test/common/main.test.bicep diff --git a/modules/Microsoft.EventGrid/eventSubscriptions/readme.md b/modules/EventGrid/eventSubscriptions/README.md similarity index 100% rename from modules/Microsoft.EventGrid/eventSubscriptions/readme.md rename to modules/EventGrid/eventSubscriptions/README.md diff --git a/modules/Microsoft.EventGrid/eventSubscriptions/main.bicep b/modules/EventGrid/eventSubscriptions/main.bicep similarity index 100% rename from modules/Microsoft.EventGrid/eventSubscriptions/main.bicep rename to modules/EventGrid/eventSubscriptions/main.bicep diff --git a/modules/Microsoft.EventGrid/eventSubscriptions/version.json b/modules/EventGrid/eventSubscriptions/version.json similarity index 100% rename from modules/Microsoft.EventGrid/eventSubscriptions/version.json rename to modules/EventGrid/eventSubscriptions/version.json diff --git a/modules/Microsoft.EventGrid/systemTopics/.bicep/nested_roleAssignments.bicep b/modules/EventGrid/systemTopics/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.EventGrid/systemTopics/.bicep/nested_roleAssignments.bicep rename to modules/EventGrid/systemTopics/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.EventGrid/systemTopics/.test/common/dependencies.bicep b/modules/EventGrid/systemTopics/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.EventGrid/systemTopics/.test/common/dependencies.bicep rename to modules/EventGrid/systemTopics/.test/common/dependencies.bicep diff --git a/modules/Microsoft.EventGrid/systemTopics/.test/common/main.test.bicep b/modules/EventGrid/systemTopics/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.EventGrid/systemTopics/.test/common/main.test.bicep rename to modules/EventGrid/systemTopics/.test/common/main.test.bicep diff --git a/modules/Microsoft.EventGrid/systemTopics/.test/min/dependencies.bicep b/modules/EventGrid/systemTopics/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.EventGrid/systemTopics/.test/min/dependencies.bicep rename to modules/EventGrid/systemTopics/.test/min/dependencies.bicep diff --git a/modules/Microsoft.EventGrid/systemTopics/.test/min/main.test.bicep b/modules/EventGrid/systemTopics/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.EventGrid/systemTopics/.test/min/main.test.bicep rename to modules/EventGrid/systemTopics/.test/min/main.test.bicep diff --git a/modules/Microsoft.EventGrid/systemTopics/readme.md b/modules/EventGrid/systemTopics/README.md similarity index 100% rename from modules/Microsoft.EventGrid/systemTopics/readme.md rename to modules/EventGrid/systemTopics/README.md diff --git a/modules/Microsoft.EventGrid/systemTopics/main.bicep b/modules/EventGrid/systemTopics/main.bicep similarity index 100% rename from modules/Microsoft.EventGrid/systemTopics/main.bicep rename to modules/EventGrid/systemTopics/main.bicep diff --git a/modules/Microsoft.EventGrid/systemTopics/version.json b/modules/EventGrid/systemTopics/version.json similarity index 100% rename from modules/Microsoft.EventGrid/systemTopics/version.json rename to modules/EventGrid/systemTopics/version.json diff --git a/modules/Microsoft.EventGrid/topics/.bicep/nested_roleAssignments.bicep b/modules/EventGrid/topics/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.EventGrid/topics/.bicep/nested_roleAssignments.bicep rename to modules/EventGrid/topics/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.EventGrid/topics/.test/common/dependencies.bicep b/modules/EventGrid/topics/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.EventGrid/topics/.test/common/dependencies.bicep rename to modules/EventGrid/topics/.test/common/dependencies.bicep diff --git a/modules/Microsoft.EventGrid/topics/.test/common/main.test.bicep b/modules/EventGrid/topics/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.EventGrid/topics/.test/common/main.test.bicep rename to modules/EventGrid/topics/.test/common/main.test.bicep diff --git a/modules/Microsoft.EventGrid/topics/.test/min/main.test.bicep b/modules/EventGrid/topics/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.EventGrid/topics/.test/min/main.test.bicep rename to modules/EventGrid/topics/.test/min/main.test.bicep diff --git a/modules/Microsoft.EventGrid/topics/.test/pe/dependencies.bicep b/modules/EventGrid/topics/.test/pe/dependencies.bicep similarity index 100% rename from modules/Microsoft.EventGrid/topics/.test/pe/dependencies.bicep rename to modules/EventGrid/topics/.test/pe/dependencies.bicep diff --git a/modules/Microsoft.EventGrid/topics/.test/pe/main.test.bicep b/modules/EventGrid/topics/.test/pe/main.test.bicep similarity index 100% rename from modules/Microsoft.EventGrid/topics/.test/pe/main.test.bicep rename to modules/EventGrid/topics/.test/pe/main.test.bicep diff --git a/modules/Microsoft.EventGrid/topics/readme.md b/modules/EventGrid/topics/README.md similarity index 100% rename from modules/Microsoft.EventGrid/topics/readme.md rename to modules/EventGrid/topics/README.md diff --git a/modules/Microsoft.EventGrid/topics/main.bicep b/modules/EventGrid/topics/main.bicep similarity index 100% rename from modules/Microsoft.EventGrid/topics/main.bicep rename to modules/EventGrid/topics/main.bicep diff --git a/modules/Microsoft.EventGrid/topics/version.json b/modules/EventGrid/topics/version.json similarity index 100% rename from modules/Microsoft.EventGrid/topics/version.json rename to modules/EventGrid/topics/version.json diff --git a/modules/Microsoft.EventHub/namespaces/.bicep/nested_roleAssignments.bicep b/modules/EventHub/namespaces/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.EventHub/namespaces/.bicep/nested_roleAssignments.bicep rename to modules/EventHub/namespaces/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.EventHub/namespaces/.test/common/dependencies.bicep b/modules/EventHub/namespaces/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.EventHub/namespaces/.test/common/dependencies.bicep rename to modules/EventHub/namespaces/.test/common/dependencies.bicep diff --git a/modules/Microsoft.EventHub/namespaces/.test/common/main.test.bicep b/modules/EventHub/namespaces/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.EventHub/namespaces/.test/common/main.test.bicep rename to modules/EventHub/namespaces/.test/common/main.test.bicep diff --git a/modules/Microsoft.EventHub/namespaces/.test/min/main.test.bicep b/modules/EventHub/namespaces/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.EventHub/namespaces/.test/min/main.test.bicep rename to modules/EventHub/namespaces/.test/min/main.test.bicep diff --git a/modules/Microsoft.EventHub/namespaces/.test/pe/dependencies.bicep b/modules/EventHub/namespaces/.test/pe/dependencies.bicep similarity index 100% rename from modules/Microsoft.EventHub/namespaces/.test/pe/dependencies.bicep rename to modules/EventHub/namespaces/.test/pe/dependencies.bicep diff --git a/modules/Microsoft.EventHub/namespaces/.test/pe/main.test.bicep b/modules/EventHub/namespaces/.test/pe/main.test.bicep similarity index 100% rename from modules/Microsoft.EventHub/namespaces/.test/pe/main.test.bicep rename to modules/EventHub/namespaces/.test/pe/main.test.bicep diff --git a/modules/Microsoft.EventHub/namespaces/readme.md b/modules/EventHub/namespaces/README.md similarity index 100% rename from modules/Microsoft.EventHub/namespaces/readme.md rename to modules/EventHub/namespaces/README.md diff --git a/modules/Microsoft.EventHub/namespaces/authorizationRules/readme.md b/modules/EventHub/namespaces/authorizationRules/README.md similarity index 100% rename from modules/Microsoft.EventHub/namespaces/authorizationRules/readme.md rename to modules/EventHub/namespaces/authorizationRules/README.md diff --git a/modules/Microsoft.EventHub/namespaces/authorizationRules/main.bicep b/modules/EventHub/namespaces/authorizationRules/main.bicep similarity index 100% rename from modules/Microsoft.EventHub/namespaces/authorizationRules/main.bicep rename to modules/EventHub/namespaces/authorizationRules/main.bicep diff --git a/modules/Microsoft.EventHub/namespaces/authorizationRules/version.json b/modules/EventHub/namespaces/authorizationRules/version.json similarity index 100% rename from modules/Microsoft.EventHub/namespaces/authorizationRules/version.json rename to modules/EventHub/namespaces/authorizationRules/version.json diff --git a/modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/readme.md b/modules/EventHub/namespaces/disasterRecoveryConfigs/README.md similarity index 100% rename from modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/readme.md rename to modules/EventHub/namespaces/disasterRecoveryConfigs/README.md diff --git a/modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/main.bicep b/modules/EventHub/namespaces/disasterRecoveryConfigs/main.bicep similarity index 100% rename from modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/main.bicep rename to modules/EventHub/namespaces/disasterRecoveryConfigs/main.bicep diff --git a/modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json b/modules/EventHub/namespaces/disasterRecoveryConfigs/version.json similarity index 100% rename from modules/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json rename to modules/EventHub/namespaces/disasterRecoveryConfigs/version.json diff --git a/modules/Microsoft.EventHub/namespaces/eventHubs/.bicep/nested_roleAssignments.bicep b/modules/EventHub/namespaces/eventHubs/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.EventHub/namespaces/eventHubs/.bicep/nested_roleAssignments.bicep rename to modules/EventHub/namespaces/eventHubs/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.EventHub/namespaces/eventHubs/readme.md b/modules/EventHub/namespaces/eventHubs/README.md similarity index 100% rename from modules/Microsoft.EventHub/namespaces/eventHubs/readme.md rename to modules/EventHub/namespaces/eventHubs/README.md diff --git a/modules/Microsoft.EventHub/namespaces/eventHubs/authorizationRules/readme.md b/modules/EventHub/namespaces/eventHubs/authorizationRules/README.md similarity index 100% rename from modules/Microsoft.EventHub/namespaces/eventHubs/authorizationRules/readme.md rename to modules/EventHub/namespaces/eventHubs/authorizationRules/README.md diff --git a/modules/Microsoft.EventHub/namespaces/eventHubs/authorizationRules/main.bicep b/modules/EventHub/namespaces/eventHubs/authorizationRules/main.bicep similarity index 100% rename from modules/Microsoft.EventHub/namespaces/eventHubs/authorizationRules/main.bicep rename to modules/EventHub/namespaces/eventHubs/authorizationRules/main.bicep diff --git a/modules/Microsoft.EventHub/namespaces/eventHubs/authorizationRules/version.json b/modules/EventHub/namespaces/eventHubs/authorizationRules/version.json similarity index 100% rename from modules/Microsoft.EventHub/namespaces/eventHubs/authorizationRules/version.json rename to modules/EventHub/namespaces/eventHubs/authorizationRules/version.json diff --git a/modules/Microsoft.EventHub/namespaces/eventHubs/consumerGroups/readme.md b/modules/EventHub/namespaces/eventHubs/consumerGroups/README.md similarity index 100% rename from modules/Microsoft.EventHub/namespaces/eventHubs/consumerGroups/readme.md rename to modules/EventHub/namespaces/eventHubs/consumerGroups/README.md diff --git a/modules/Microsoft.EventHub/namespaces/eventHubs/consumerGroups/main.bicep b/modules/EventHub/namespaces/eventHubs/consumerGroups/main.bicep similarity index 100% rename from modules/Microsoft.EventHub/namespaces/eventHubs/consumerGroups/main.bicep rename to modules/EventHub/namespaces/eventHubs/consumerGroups/main.bicep diff --git a/modules/Microsoft.EventHub/namespaces/eventHubs/consumerGroups/version.json b/modules/EventHub/namespaces/eventHubs/consumerGroups/version.json similarity index 100% rename from modules/Microsoft.EventHub/namespaces/eventHubs/consumerGroups/version.json rename to modules/EventHub/namespaces/eventHubs/consumerGroups/version.json diff --git a/modules/Microsoft.EventHub/namespaces/eventHubs/main.bicep b/modules/EventHub/namespaces/eventHubs/main.bicep similarity index 100% rename from modules/Microsoft.EventHub/namespaces/eventHubs/main.bicep rename to modules/EventHub/namespaces/eventHubs/main.bicep diff --git a/modules/Microsoft.EventHub/namespaces/eventHubs/version.json b/modules/EventHub/namespaces/eventHubs/version.json similarity index 100% rename from modules/Microsoft.EventHub/namespaces/eventHubs/version.json rename to modules/EventHub/namespaces/eventHubs/version.json diff --git a/modules/Microsoft.EventHub/namespaces/main.bicep b/modules/EventHub/namespaces/main.bicep similarity index 100% rename from modules/Microsoft.EventHub/namespaces/main.bicep rename to modules/EventHub/namespaces/main.bicep diff --git a/modules/Microsoft.EventHub/namespaces/networkRuleSets/readme.md b/modules/EventHub/namespaces/networkRuleSets/README.md similarity index 100% rename from modules/Microsoft.EventHub/namespaces/networkRuleSets/readme.md rename to modules/EventHub/namespaces/networkRuleSets/README.md diff --git a/modules/Microsoft.EventHub/namespaces/networkRuleSets/main.bicep b/modules/EventHub/namespaces/networkRuleSets/main.bicep similarity index 100% rename from modules/Microsoft.EventHub/namespaces/networkRuleSets/main.bicep rename to modules/EventHub/namespaces/networkRuleSets/main.bicep diff --git a/modules/Microsoft.EventHub/namespaces/networkRuleSets/version.json b/modules/EventHub/namespaces/networkRuleSets/version.json similarity index 100% rename from modules/Microsoft.EventHub/namespaces/networkRuleSets/version.json rename to modules/EventHub/namespaces/networkRuleSets/version.json diff --git a/modules/Microsoft.EventHub/namespaces/version.json b/modules/EventHub/namespaces/version.json similarity index 100% rename from modules/Microsoft.EventHub/namespaces/version.json rename to modules/EventHub/namespaces/version.json diff --git a/modules/Microsoft.HealthBot/healthBots/.bicep/nested_roleAssignments.bicep b/modules/HealthBot/healthBots/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.HealthBot/healthBots/.bicep/nested_roleAssignments.bicep rename to modules/HealthBot/healthBots/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.HealthBot/healthBots/.test/common/dependencies.bicep b/modules/HealthBot/healthBots/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.HealthBot/healthBots/.test/common/dependencies.bicep rename to modules/HealthBot/healthBots/.test/common/dependencies.bicep diff --git a/modules/Microsoft.HealthBot/healthBots/.test/common/main.test.bicep b/modules/HealthBot/healthBots/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.HealthBot/healthBots/.test/common/main.test.bicep rename to modules/HealthBot/healthBots/.test/common/main.test.bicep diff --git a/modules/Microsoft.HealthBot/healthBots/.test/min/main.test.bicep b/modules/HealthBot/healthBots/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.HealthBot/healthBots/.test/min/main.test.bicep rename to modules/HealthBot/healthBots/.test/min/main.test.bicep diff --git a/modules/Microsoft.HealthBot/healthBots/readme.md b/modules/HealthBot/healthBots/README.md similarity index 100% rename from modules/Microsoft.HealthBot/healthBots/readme.md rename to modules/HealthBot/healthBots/README.md diff --git a/modules/Microsoft.HealthBot/healthBots/main.bicep b/modules/HealthBot/healthBots/main.bicep similarity index 100% rename from modules/Microsoft.HealthBot/healthBots/main.bicep rename to modules/HealthBot/healthBots/main.bicep diff --git a/modules/Microsoft.HealthBot/healthBots/version.json b/modules/HealthBot/healthBots/version.json similarity index 100% rename from modules/Microsoft.HealthBot/healthBots/version.json rename to modules/HealthBot/healthBots/version.json diff --git a/modules/Microsoft.HealthcareApis/workspaces/.bicep/nested_roleAssignments.bicep b/modules/HealthcareApis/workspaces/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.HealthcareApis/workspaces/.bicep/nested_roleAssignments.bicep rename to modules/HealthcareApis/workspaces/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.HealthcareApis/workspaces/.test/common/dependencies.bicep b/modules/HealthcareApis/workspaces/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.HealthcareApis/workspaces/.test/common/dependencies.bicep rename to modules/HealthcareApis/workspaces/.test/common/dependencies.bicep diff --git a/modules/Microsoft.HealthcareApis/workspaces/.test/common/main.test.bicep b/modules/HealthcareApis/workspaces/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.HealthcareApis/workspaces/.test/common/main.test.bicep rename to modules/HealthcareApis/workspaces/.test/common/main.test.bicep diff --git a/modules/Microsoft.HealthcareApis/workspaces/.test/min/main.test.bicep b/modules/HealthcareApis/workspaces/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.HealthcareApis/workspaces/.test/min/main.test.bicep rename to modules/HealthcareApis/workspaces/.test/min/main.test.bicep diff --git a/modules/Microsoft.HealthcareApis/workspaces/readme.md b/modules/HealthcareApis/workspaces/README.md similarity index 100% rename from modules/Microsoft.HealthcareApis/workspaces/readme.md rename to modules/HealthcareApis/workspaces/README.md diff --git a/modules/Microsoft.HealthcareApis/workspaces/dicomservices/readme.md b/modules/HealthcareApis/workspaces/dicomservices/README.md similarity index 100% rename from modules/Microsoft.HealthcareApis/workspaces/dicomservices/readme.md rename to modules/HealthcareApis/workspaces/dicomservices/README.md diff --git a/modules/Microsoft.HealthcareApis/workspaces/dicomservices/main.bicep b/modules/HealthcareApis/workspaces/dicomservices/main.bicep similarity index 100% rename from modules/Microsoft.HealthcareApis/workspaces/dicomservices/main.bicep rename to modules/HealthcareApis/workspaces/dicomservices/main.bicep diff --git a/modules/Microsoft.HealthcareApis/workspaces/dicomservices/version.json b/modules/HealthcareApis/workspaces/dicomservices/version.json similarity index 100% rename from modules/Microsoft.HealthcareApis/workspaces/dicomservices/version.json rename to modules/HealthcareApis/workspaces/dicomservices/version.json diff --git a/modules/Microsoft.HealthcareApis/workspaces/fhirservices/.bicep/nested_roleAssignments.bicep b/modules/HealthcareApis/workspaces/fhirservices/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.HealthcareApis/workspaces/fhirservices/.bicep/nested_roleAssignments.bicep rename to modules/HealthcareApis/workspaces/fhirservices/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.HealthcareApis/workspaces/fhirservices/readme.md b/modules/HealthcareApis/workspaces/fhirservices/README.md similarity index 100% rename from modules/Microsoft.HealthcareApis/workspaces/fhirservices/readme.md rename to modules/HealthcareApis/workspaces/fhirservices/README.md diff --git a/modules/Microsoft.HealthcareApis/workspaces/fhirservices/main.bicep b/modules/HealthcareApis/workspaces/fhirservices/main.bicep similarity index 100% rename from modules/Microsoft.HealthcareApis/workspaces/fhirservices/main.bicep rename to modules/HealthcareApis/workspaces/fhirservices/main.bicep diff --git a/modules/Microsoft.HealthcareApis/workspaces/fhirservices/version.json b/modules/HealthcareApis/workspaces/fhirservices/version.json similarity index 100% rename from modules/Microsoft.HealthcareApis/workspaces/fhirservices/version.json rename to modules/HealthcareApis/workspaces/fhirservices/version.json diff --git a/modules/Microsoft.HealthcareApis/workspaces/iotconnectors/readme.md b/modules/HealthcareApis/workspaces/iotconnectors/README.md similarity index 100% rename from modules/Microsoft.HealthcareApis/workspaces/iotconnectors/readme.md rename to modules/HealthcareApis/workspaces/iotconnectors/README.md diff --git a/modules/Microsoft.HealthcareApis/workspaces/iotconnectors/fhirdestinations/readme.md b/modules/HealthcareApis/workspaces/iotconnectors/fhirdestinations/README.md similarity index 100% rename from modules/Microsoft.HealthcareApis/workspaces/iotconnectors/fhirdestinations/readme.md rename to modules/HealthcareApis/workspaces/iotconnectors/fhirdestinations/README.md diff --git a/modules/Microsoft.HealthcareApis/workspaces/iotconnectors/fhirdestinations/main.bicep b/modules/HealthcareApis/workspaces/iotconnectors/fhirdestinations/main.bicep similarity index 100% rename from modules/Microsoft.HealthcareApis/workspaces/iotconnectors/fhirdestinations/main.bicep rename to modules/HealthcareApis/workspaces/iotconnectors/fhirdestinations/main.bicep diff --git a/modules/Microsoft.HealthcareApis/workspaces/iotconnectors/fhirdestinations/version.json b/modules/HealthcareApis/workspaces/iotconnectors/fhirdestinations/version.json similarity index 100% rename from modules/Microsoft.HealthcareApis/workspaces/iotconnectors/fhirdestinations/version.json rename to modules/HealthcareApis/workspaces/iotconnectors/fhirdestinations/version.json diff --git a/modules/Microsoft.HealthcareApis/workspaces/iotconnectors/main.bicep b/modules/HealthcareApis/workspaces/iotconnectors/main.bicep similarity index 100% rename from modules/Microsoft.HealthcareApis/workspaces/iotconnectors/main.bicep rename to modules/HealthcareApis/workspaces/iotconnectors/main.bicep diff --git a/modules/Microsoft.HealthcareApis/workspaces/iotconnectors/version.json b/modules/HealthcareApis/workspaces/iotconnectors/version.json similarity index 100% rename from modules/Microsoft.HealthcareApis/workspaces/iotconnectors/version.json rename to modules/HealthcareApis/workspaces/iotconnectors/version.json diff --git a/modules/Microsoft.HealthcareApis/workspaces/main.bicep b/modules/HealthcareApis/workspaces/main.bicep similarity index 100% rename from modules/Microsoft.HealthcareApis/workspaces/main.bicep rename to modules/HealthcareApis/workspaces/main.bicep diff --git a/modules/Microsoft.HealthcareApis/workspaces/version.json b/modules/HealthcareApis/workspaces/version.json similarity index 100% rename from modules/Microsoft.HealthcareApis/workspaces/version.json rename to modules/HealthcareApis/workspaces/version.json diff --git a/modules/Microsoft.Insights/actionGroups/.bicep/nested_roleAssignments.bicep b/modules/Insights/actionGroups/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Insights/actionGroups/.bicep/nested_roleAssignments.bicep rename to modules/Insights/actionGroups/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Insights/actionGroups/.test/common/dependencies.bicep b/modules/Insights/actionGroups/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Insights/actionGroups/.test/common/dependencies.bicep rename to modules/Insights/actionGroups/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Insights/actionGroups/.test/common/main.test.bicep b/modules/Insights/actionGroups/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Insights/actionGroups/.test/common/main.test.bicep rename to modules/Insights/actionGroups/.test/common/main.test.bicep diff --git a/modules/Microsoft.Insights/actionGroups/.test/min/main.test.bicep b/modules/Insights/actionGroups/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Insights/actionGroups/.test/min/main.test.bicep rename to modules/Insights/actionGroups/.test/min/main.test.bicep diff --git a/modules/Microsoft.Insights/actionGroups/readme.md b/modules/Insights/actionGroups/README.md similarity index 100% rename from modules/Microsoft.Insights/actionGroups/readme.md rename to modules/Insights/actionGroups/README.md diff --git a/modules/Microsoft.Insights/actionGroups/main.bicep b/modules/Insights/actionGroups/main.bicep similarity index 100% rename from modules/Microsoft.Insights/actionGroups/main.bicep rename to modules/Insights/actionGroups/main.bicep diff --git a/modules/Microsoft.Insights/actionGroups/version.json b/modules/Insights/actionGroups/version.json similarity index 100% rename from modules/Microsoft.Insights/actionGroups/version.json rename to modules/Insights/actionGroups/version.json diff --git a/modules/Microsoft.Insights/activityLogAlerts/.bicep/nested_roleAssignments.bicep b/modules/Insights/activityLogAlerts/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Insights/activityLogAlerts/.bicep/nested_roleAssignments.bicep rename to modules/Insights/activityLogAlerts/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Insights/activityLogAlerts/.test/common/dependencies.bicep b/modules/Insights/activityLogAlerts/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Insights/activityLogAlerts/.test/common/dependencies.bicep rename to modules/Insights/activityLogAlerts/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Insights/activityLogAlerts/.test/common/main.test.bicep b/modules/Insights/activityLogAlerts/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Insights/activityLogAlerts/.test/common/main.test.bicep rename to modules/Insights/activityLogAlerts/.test/common/main.test.bicep diff --git a/modules/Microsoft.Insights/activityLogAlerts/readme.md b/modules/Insights/activityLogAlerts/README.md similarity index 100% rename from modules/Microsoft.Insights/activityLogAlerts/readme.md rename to modules/Insights/activityLogAlerts/README.md diff --git a/modules/Microsoft.Insights/activityLogAlerts/main.bicep b/modules/Insights/activityLogAlerts/main.bicep similarity index 100% rename from modules/Microsoft.Insights/activityLogAlerts/main.bicep rename to modules/Insights/activityLogAlerts/main.bicep diff --git a/modules/Microsoft.Insights/activityLogAlerts/version.json b/modules/Insights/activityLogAlerts/version.json similarity index 100% rename from modules/Microsoft.Insights/activityLogAlerts/version.json rename to modules/Insights/activityLogAlerts/version.json diff --git a/modules/Microsoft.Insights/components/.bicep/nested_roleAssignments.bicep b/modules/Insights/components/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Insights/components/.bicep/nested_roleAssignments.bicep rename to modules/Insights/components/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Insights/components/.test/common/dependencies.bicep b/modules/Insights/components/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Insights/components/.test/common/dependencies.bicep rename to modules/Insights/components/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Insights/components/.test/common/main.test.bicep b/modules/Insights/components/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Insights/components/.test/common/main.test.bicep rename to modules/Insights/components/.test/common/main.test.bicep diff --git a/modules/Microsoft.Insights/components/.test/min/dependencies.bicep b/modules/Insights/components/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.Insights/components/.test/min/dependencies.bicep rename to modules/Insights/components/.test/min/dependencies.bicep diff --git a/modules/Microsoft.Insights/components/.test/min/main.test.bicep b/modules/Insights/components/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Insights/components/.test/min/main.test.bicep rename to modules/Insights/components/.test/min/main.test.bicep diff --git a/modules/Microsoft.Insights/components/readme.md b/modules/Insights/components/README.md similarity index 100% rename from modules/Microsoft.Insights/components/readme.md rename to modules/Insights/components/README.md diff --git a/modules/Microsoft.Insights/components/main.bicep b/modules/Insights/components/main.bicep similarity index 100% rename from modules/Microsoft.Insights/components/main.bicep rename to modules/Insights/components/main.bicep diff --git a/modules/Microsoft.Insights/components/version.json b/modules/Insights/components/version.json similarity index 100% rename from modules/Microsoft.Insights/components/version.json rename to modules/Insights/components/version.json diff --git a/modules/Microsoft.Insights/dataCollectionEndpoints/.bicep/nested_roleAssignments.bicep b/modules/Insights/dataCollectionEndpoints/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Insights/dataCollectionEndpoints/.bicep/nested_roleAssignments.bicep rename to modules/Insights/dataCollectionEndpoints/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Insights/dataCollectionEndpoints/.test/common/dependencies.bicep b/modules/Insights/dataCollectionEndpoints/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Insights/dataCollectionEndpoints/.test/common/dependencies.bicep rename to modules/Insights/dataCollectionEndpoints/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Insights/dataCollectionEndpoints/.test/common/main.test.bicep b/modules/Insights/dataCollectionEndpoints/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Insights/dataCollectionEndpoints/.test/common/main.test.bicep rename to modules/Insights/dataCollectionEndpoints/.test/common/main.test.bicep diff --git a/modules/Microsoft.Insights/dataCollectionEndpoints/.test/min/main.test.bicep b/modules/Insights/dataCollectionEndpoints/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Insights/dataCollectionEndpoints/.test/min/main.test.bicep rename to modules/Insights/dataCollectionEndpoints/.test/min/main.test.bicep diff --git a/modules/Microsoft.Insights/dataCollectionEndpoints/readme.md b/modules/Insights/dataCollectionEndpoints/README.md similarity index 100% rename from modules/Microsoft.Insights/dataCollectionEndpoints/readme.md rename to modules/Insights/dataCollectionEndpoints/README.md diff --git a/modules/Microsoft.Insights/dataCollectionEndpoints/main.bicep b/modules/Insights/dataCollectionEndpoints/main.bicep similarity index 100% rename from modules/Microsoft.Insights/dataCollectionEndpoints/main.bicep rename to modules/Insights/dataCollectionEndpoints/main.bicep diff --git a/modules/Microsoft.Insights/dataCollectionEndpoints/version.json b/modules/Insights/dataCollectionEndpoints/version.json similarity index 100% rename from modules/Microsoft.Insights/dataCollectionEndpoints/version.json rename to modules/Insights/dataCollectionEndpoints/version.json diff --git a/modules/Microsoft.Insights/dataCollectionRules/.bicep/nested_roleAssignments.bicep b/modules/Insights/dataCollectionRules/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Insights/dataCollectionRules/.bicep/nested_roleAssignments.bicep rename to modules/Insights/dataCollectionRules/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/customadv/dependencies.bicep b/modules/Insights/dataCollectionRules/.test/customadv/dependencies.bicep similarity index 100% rename from modules/Microsoft.Insights/dataCollectionRules/.test/customadv/dependencies.bicep rename to modules/Insights/dataCollectionRules/.test/customadv/dependencies.bicep diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/customadv/main.test.bicep b/modules/Insights/dataCollectionRules/.test/customadv/main.test.bicep similarity index 100% rename from modules/Microsoft.Insights/dataCollectionRules/.test/customadv/main.test.bicep rename to modules/Insights/dataCollectionRules/.test/customadv/main.test.bicep diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/custombasic/dependencies.bicep b/modules/Insights/dataCollectionRules/.test/custombasic/dependencies.bicep similarity index 100% rename from modules/Microsoft.Insights/dataCollectionRules/.test/custombasic/dependencies.bicep rename to modules/Insights/dataCollectionRules/.test/custombasic/dependencies.bicep diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/custombasic/main.test.bicep b/modules/Insights/dataCollectionRules/.test/custombasic/main.test.bicep similarity index 100% rename from modules/Microsoft.Insights/dataCollectionRules/.test/custombasic/main.test.bicep rename to modules/Insights/dataCollectionRules/.test/custombasic/main.test.bicep diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/customiis/dependencies.bicep b/modules/Insights/dataCollectionRules/.test/customiis/dependencies.bicep similarity index 100% rename from modules/Microsoft.Insights/dataCollectionRules/.test/customiis/dependencies.bicep rename to modules/Insights/dataCollectionRules/.test/customiis/dependencies.bicep diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/customiis/main.test.bicep b/modules/Insights/dataCollectionRules/.test/customiis/main.test.bicep similarity index 100% rename from modules/Microsoft.Insights/dataCollectionRules/.test/customiis/main.test.bicep rename to modules/Insights/dataCollectionRules/.test/customiis/main.test.bicep diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/linux/dependencies.bicep b/modules/Insights/dataCollectionRules/.test/linux/dependencies.bicep similarity index 100% rename from modules/Microsoft.Insights/dataCollectionRules/.test/linux/dependencies.bicep rename to modules/Insights/dataCollectionRules/.test/linux/dependencies.bicep diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/linux/main.test.bicep b/modules/Insights/dataCollectionRules/.test/linux/main.test.bicep similarity index 100% rename from modules/Microsoft.Insights/dataCollectionRules/.test/linux/main.test.bicep rename to modules/Insights/dataCollectionRules/.test/linux/main.test.bicep diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/min/main.test.bicep b/modules/Insights/dataCollectionRules/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Insights/dataCollectionRules/.test/min/main.test.bicep rename to modules/Insights/dataCollectionRules/.test/min/main.test.bicep diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/windows/dependencies.bicep b/modules/Insights/dataCollectionRules/.test/windows/dependencies.bicep similarity index 100% rename from modules/Microsoft.Insights/dataCollectionRules/.test/windows/dependencies.bicep rename to modules/Insights/dataCollectionRules/.test/windows/dependencies.bicep diff --git a/modules/Microsoft.Insights/dataCollectionRules/.test/windows/main.test.bicep b/modules/Insights/dataCollectionRules/.test/windows/main.test.bicep similarity index 100% rename from modules/Microsoft.Insights/dataCollectionRules/.test/windows/main.test.bicep rename to modules/Insights/dataCollectionRules/.test/windows/main.test.bicep diff --git a/modules/Microsoft.Insights/dataCollectionRules/readme.md b/modules/Insights/dataCollectionRules/README.md similarity index 100% rename from modules/Microsoft.Insights/dataCollectionRules/readme.md rename to modules/Insights/dataCollectionRules/README.md diff --git a/modules/Microsoft.Insights/dataCollectionRules/main.bicep b/modules/Insights/dataCollectionRules/main.bicep similarity index 100% rename from modules/Microsoft.Insights/dataCollectionRules/main.bicep rename to modules/Insights/dataCollectionRules/main.bicep diff --git a/modules/Microsoft.Insights/dataCollectionRules/version.json b/modules/Insights/dataCollectionRules/version.json similarity index 100% rename from modules/Microsoft.Insights/dataCollectionRules/version.json rename to modules/Insights/dataCollectionRules/version.json diff --git a/modules/Microsoft.Insights/diagnosticSettings/.test/common/main.test.bicep b/modules/Insights/diagnosticSettings/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Insights/diagnosticSettings/.test/common/main.test.bicep rename to modules/Insights/diagnosticSettings/.test/common/main.test.bicep diff --git a/modules/Microsoft.Insights/diagnosticSettings/readme.md b/modules/Insights/diagnosticSettings/README.md similarity index 100% rename from modules/Microsoft.Insights/diagnosticSettings/readme.md rename to modules/Insights/diagnosticSettings/README.md diff --git a/modules/Microsoft.Insights/diagnosticSettings/main.bicep b/modules/Insights/diagnosticSettings/main.bicep similarity index 100% rename from modules/Microsoft.Insights/diagnosticSettings/main.bicep rename to modules/Insights/diagnosticSettings/main.bicep diff --git a/modules/Microsoft.Insights/diagnosticSettings/version.json b/modules/Insights/diagnosticSettings/version.json similarity index 100% rename from modules/Microsoft.Insights/diagnosticSettings/version.json rename to modules/Insights/diagnosticSettings/version.json diff --git a/modules/Microsoft.Insights/metricAlerts/.bicep/nested_roleAssignments.bicep b/modules/Insights/metricAlerts/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Insights/metricAlerts/.bicep/nested_roleAssignments.bicep rename to modules/Insights/metricAlerts/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Insights/metricAlerts/.test/common/dependencies.bicep b/modules/Insights/metricAlerts/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Insights/metricAlerts/.test/common/dependencies.bicep rename to modules/Insights/metricAlerts/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Insights/metricAlerts/.test/common/main.test.bicep b/modules/Insights/metricAlerts/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Insights/metricAlerts/.test/common/main.test.bicep rename to modules/Insights/metricAlerts/.test/common/main.test.bicep diff --git a/modules/Microsoft.Insights/metricAlerts/readme.md b/modules/Insights/metricAlerts/README.md similarity index 100% rename from modules/Microsoft.Insights/metricAlerts/readme.md rename to modules/Insights/metricAlerts/README.md diff --git a/modules/Microsoft.Insights/metricAlerts/main.bicep b/modules/Insights/metricAlerts/main.bicep similarity index 100% rename from modules/Microsoft.Insights/metricAlerts/main.bicep rename to modules/Insights/metricAlerts/main.bicep diff --git a/modules/Microsoft.Insights/metricAlerts/version.json b/modules/Insights/metricAlerts/version.json similarity index 100% rename from modules/Microsoft.Insights/metricAlerts/version.json rename to modules/Insights/metricAlerts/version.json diff --git a/modules/Microsoft.Insights/privateLinkScopes/.bicep/nested_roleAssignments.bicep b/modules/Insights/privateLinkScopes/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Insights/privateLinkScopes/.bicep/nested_roleAssignments.bicep rename to modules/Insights/privateLinkScopes/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Insights/privateLinkScopes/.test/common/dependencies.bicep b/modules/Insights/privateLinkScopes/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Insights/privateLinkScopes/.test/common/dependencies.bicep rename to modules/Insights/privateLinkScopes/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Insights/privateLinkScopes/.test/common/main.test.bicep b/modules/Insights/privateLinkScopes/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Insights/privateLinkScopes/.test/common/main.test.bicep rename to modules/Insights/privateLinkScopes/.test/common/main.test.bicep diff --git a/modules/Microsoft.Insights/privateLinkScopes/.test/min/main.test.bicep b/modules/Insights/privateLinkScopes/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Insights/privateLinkScopes/.test/min/main.test.bicep rename to modules/Insights/privateLinkScopes/.test/min/main.test.bicep diff --git a/modules/Microsoft.Insights/privateLinkScopes/readme.md b/modules/Insights/privateLinkScopes/README.md similarity index 100% rename from modules/Microsoft.Insights/privateLinkScopes/readme.md rename to modules/Insights/privateLinkScopes/README.md diff --git a/modules/Microsoft.Insights/privateLinkScopes/main.bicep b/modules/Insights/privateLinkScopes/main.bicep similarity index 100% rename from modules/Microsoft.Insights/privateLinkScopes/main.bicep rename to modules/Insights/privateLinkScopes/main.bicep diff --git a/modules/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md b/modules/Insights/privateLinkScopes/scopedResources/README.md similarity index 100% rename from modules/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md rename to modules/Insights/privateLinkScopes/scopedResources/README.md diff --git a/modules/Microsoft.Insights/privateLinkScopes/scopedResources/main.bicep b/modules/Insights/privateLinkScopes/scopedResources/main.bicep similarity index 100% rename from modules/Microsoft.Insights/privateLinkScopes/scopedResources/main.bicep rename to modules/Insights/privateLinkScopes/scopedResources/main.bicep diff --git a/modules/Microsoft.Insights/privateLinkScopes/scopedResources/version.json b/modules/Insights/privateLinkScopes/scopedResources/version.json similarity index 100% rename from modules/Microsoft.Insights/privateLinkScopes/scopedResources/version.json rename to modules/Insights/privateLinkScopes/scopedResources/version.json diff --git a/modules/Microsoft.Insights/privateLinkScopes/version.json b/modules/Insights/privateLinkScopes/version.json similarity index 100% rename from modules/Microsoft.Insights/privateLinkScopes/version.json rename to modules/Insights/privateLinkScopes/version.json diff --git a/modules/Microsoft.Insights/scheduledQueryRules/.bicep/nested_roleAssignments.bicep b/modules/Insights/scheduledQueryRules/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Insights/scheduledQueryRules/.bicep/nested_roleAssignments.bicep rename to modules/Insights/scheduledQueryRules/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Insights/scheduledQueryRules/.test/common/dependencies.bicep b/modules/Insights/scheduledQueryRules/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Insights/scheduledQueryRules/.test/common/dependencies.bicep rename to modules/Insights/scheduledQueryRules/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Insights/scheduledQueryRules/.test/common/main.test.bicep b/modules/Insights/scheduledQueryRules/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Insights/scheduledQueryRules/.test/common/main.test.bicep rename to modules/Insights/scheduledQueryRules/.test/common/main.test.bicep diff --git a/modules/Microsoft.Insights/scheduledQueryRules/readme.md b/modules/Insights/scheduledQueryRules/README.md similarity index 100% rename from modules/Microsoft.Insights/scheduledQueryRules/readme.md rename to modules/Insights/scheduledQueryRules/README.md diff --git a/modules/Microsoft.Insights/scheduledQueryRules/main.bicep b/modules/Insights/scheduledQueryRules/main.bicep similarity index 100% rename from modules/Microsoft.Insights/scheduledQueryRules/main.bicep rename to modules/Insights/scheduledQueryRules/main.bicep diff --git a/modules/Microsoft.Insights/scheduledQueryRules/version.json b/modules/Insights/scheduledQueryRules/version.json similarity index 100% rename from modules/Microsoft.Insights/scheduledQueryRules/version.json rename to modules/Insights/scheduledQueryRules/version.json diff --git a/modules/Microsoft.Insights/webTests/.bicep/nested_roleAssignments.bicep b/modules/Insights/webTests/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Insights/webTests/.bicep/nested_roleAssignments.bicep rename to modules/Insights/webTests/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Insights/webTests/.test/common/dependencies.bicep b/modules/Insights/webTests/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Insights/webTests/.test/common/dependencies.bicep rename to modules/Insights/webTests/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Insights/webTests/.test/common/main.test.bicep b/modules/Insights/webTests/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Insights/webTests/.test/common/main.test.bicep rename to modules/Insights/webTests/.test/common/main.test.bicep diff --git a/modules/Microsoft.Insights/webTests/.test/min/dependencies.bicep b/modules/Insights/webTests/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.Insights/webTests/.test/min/dependencies.bicep rename to modules/Insights/webTests/.test/min/dependencies.bicep diff --git a/modules/Microsoft.Insights/webTests/.test/min/main.test.bicep b/modules/Insights/webTests/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Insights/webTests/.test/min/main.test.bicep rename to modules/Insights/webTests/.test/min/main.test.bicep diff --git a/modules/Microsoft.Insights/webTests/readme.md b/modules/Insights/webTests/README.md similarity index 100% rename from modules/Microsoft.Insights/webTests/readme.md rename to modules/Insights/webTests/README.md diff --git a/modules/Microsoft.Insights/webTests/main.bicep b/modules/Insights/webTests/main.bicep similarity index 100% rename from modules/Microsoft.Insights/webTests/main.bicep rename to modules/Insights/webTests/main.bicep diff --git a/modules/Microsoft.Insights/webTests/version.json b/modules/Insights/webTests/version.json similarity index 100% rename from modules/Microsoft.Insights/webTests/version.json rename to modules/Insights/webTests/version.json diff --git a/modules/Microsoft.KeyVault/vaults/.bicep/nested_roleAssignments.bicep b/modules/KeyVault/vaults/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.KeyVault/vaults/.bicep/nested_roleAssignments.bicep rename to modules/KeyVault/vaults/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.KeyVault/vaults/.test/common/dependencies.bicep b/modules/KeyVault/vaults/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.KeyVault/vaults/.test/common/dependencies.bicep rename to modules/KeyVault/vaults/.test/common/dependencies.bicep diff --git a/modules/Microsoft.KeyVault/vaults/.test/common/main.test.bicep b/modules/KeyVault/vaults/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.KeyVault/vaults/.test/common/main.test.bicep rename to modules/KeyVault/vaults/.test/common/main.test.bicep diff --git a/modules/Microsoft.KeyVault/vaults/.test/min/main.test.bicep b/modules/KeyVault/vaults/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.KeyVault/vaults/.test/min/main.test.bicep rename to modules/KeyVault/vaults/.test/min/main.test.bicep diff --git a/modules/Microsoft.KeyVault/vaults/.test/pe/dependencies.bicep b/modules/KeyVault/vaults/.test/pe/dependencies.bicep similarity index 100% rename from modules/Microsoft.KeyVault/vaults/.test/pe/dependencies.bicep rename to modules/KeyVault/vaults/.test/pe/dependencies.bicep diff --git a/modules/Microsoft.KeyVault/vaults/.test/pe/main.test.bicep b/modules/KeyVault/vaults/.test/pe/main.test.bicep similarity index 100% rename from modules/Microsoft.KeyVault/vaults/.test/pe/main.test.bicep rename to modules/KeyVault/vaults/.test/pe/main.test.bicep diff --git a/modules/Microsoft.KeyVault/vaults/readme.md b/modules/KeyVault/vaults/README.md similarity index 100% rename from modules/Microsoft.KeyVault/vaults/readme.md rename to modules/KeyVault/vaults/README.md diff --git a/modules/Microsoft.KeyVault/vaults/accessPolicies/readme.md b/modules/KeyVault/vaults/accessPolicies/README.md similarity index 100% rename from modules/Microsoft.KeyVault/vaults/accessPolicies/readme.md rename to modules/KeyVault/vaults/accessPolicies/README.md diff --git a/modules/Microsoft.KeyVault/vaults/accessPolicies/main.bicep b/modules/KeyVault/vaults/accessPolicies/main.bicep similarity index 100% rename from modules/Microsoft.KeyVault/vaults/accessPolicies/main.bicep rename to modules/KeyVault/vaults/accessPolicies/main.bicep diff --git a/modules/Microsoft.KeyVault/vaults/accessPolicies/version.json b/modules/KeyVault/vaults/accessPolicies/version.json similarity index 100% rename from modules/Microsoft.KeyVault/vaults/accessPolicies/version.json rename to modules/KeyVault/vaults/accessPolicies/version.json diff --git a/modules/Microsoft.KeyVault/vaults/keys/.bicep/nested_roleAssignments.bicep b/modules/KeyVault/vaults/keys/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.KeyVault/vaults/keys/.bicep/nested_roleAssignments.bicep rename to modules/KeyVault/vaults/keys/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.KeyVault/vaults/keys/readme.md b/modules/KeyVault/vaults/keys/README.md similarity index 100% rename from modules/Microsoft.KeyVault/vaults/keys/readme.md rename to modules/KeyVault/vaults/keys/README.md diff --git a/modules/Microsoft.KeyVault/vaults/keys/main.bicep b/modules/KeyVault/vaults/keys/main.bicep similarity index 100% rename from modules/Microsoft.KeyVault/vaults/keys/main.bicep rename to modules/KeyVault/vaults/keys/main.bicep diff --git a/modules/Microsoft.KeyVault/vaults/keys/version.json b/modules/KeyVault/vaults/keys/version.json similarity index 100% rename from modules/Microsoft.KeyVault/vaults/keys/version.json rename to modules/KeyVault/vaults/keys/version.json diff --git a/modules/Microsoft.KeyVault/vaults/main.bicep b/modules/KeyVault/vaults/main.bicep similarity index 100% rename from modules/Microsoft.KeyVault/vaults/main.bicep rename to modules/KeyVault/vaults/main.bicep diff --git a/modules/Microsoft.KeyVault/vaults/secrets/.bicep/nested_roleAssignments.bicep b/modules/KeyVault/vaults/secrets/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.KeyVault/vaults/secrets/.bicep/nested_roleAssignments.bicep rename to modules/KeyVault/vaults/secrets/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.KeyVault/vaults/secrets/readme.md b/modules/KeyVault/vaults/secrets/README.md similarity index 100% rename from modules/Microsoft.KeyVault/vaults/secrets/readme.md rename to modules/KeyVault/vaults/secrets/README.md diff --git a/modules/Microsoft.KeyVault/vaults/secrets/main.bicep b/modules/KeyVault/vaults/secrets/main.bicep similarity index 100% rename from modules/Microsoft.KeyVault/vaults/secrets/main.bicep rename to modules/KeyVault/vaults/secrets/main.bicep diff --git a/modules/Microsoft.KeyVault/vaults/secrets/version.json b/modules/KeyVault/vaults/secrets/version.json similarity index 100% rename from modules/Microsoft.KeyVault/vaults/secrets/version.json rename to modules/KeyVault/vaults/secrets/version.json diff --git a/modules/Microsoft.KeyVault/vaults/version.json b/modules/KeyVault/vaults/version.json similarity index 100% rename from modules/Microsoft.KeyVault/vaults/version.json rename to modules/KeyVault/vaults/version.json diff --git a/modules/Microsoft.KubernetesConfiguration/extensions/.test/common/dependencies.bicep b/modules/KubernetesConfiguration/extensions/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.KubernetesConfiguration/extensions/.test/common/dependencies.bicep rename to modules/KubernetesConfiguration/extensions/.test/common/dependencies.bicep diff --git a/modules/Microsoft.KubernetesConfiguration/extensions/.test/common/main.test.bicep b/modules/KubernetesConfiguration/extensions/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.KubernetesConfiguration/extensions/.test/common/main.test.bicep rename to modules/KubernetesConfiguration/extensions/.test/common/main.test.bicep diff --git a/modules/Microsoft.KubernetesConfiguration/extensions/.test/min/dependencies.bicep b/modules/KubernetesConfiguration/extensions/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.KubernetesConfiguration/extensions/.test/min/dependencies.bicep rename to modules/KubernetesConfiguration/extensions/.test/min/dependencies.bicep diff --git a/modules/Microsoft.KubernetesConfiguration/extensions/.test/min/main.test.bicep b/modules/KubernetesConfiguration/extensions/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.KubernetesConfiguration/extensions/.test/min/main.test.bicep rename to modules/KubernetesConfiguration/extensions/.test/min/main.test.bicep diff --git a/modules/Microsoft.KubernetesConfiguration/extensions/readme.md b/modules/KubernetesConfiguration/extensions/README.md similarity index 100% rename from modules/Microsoft.KubernetesConfiguration/extensions/readme.md rename to modules/KubernetesConfiguration/extensions/README.md diff --git a/modules/Microsoft.KubernetesConfiguration/extensions/main.bicep b/modules/KubernetesConfiguration/extensions/main.bicep similarity index 100% rename from modules/Microsoft.KubernetesConfiguration/extensions/main.bicep rename to modules/KubernetesConfiguration/extensions/main.bicep diff --git a/modules/Microsoft.KubernetesConfiguration/extensions/version.json b/modules/KubernetesConfiguration/extensions/version.json similarity index 100% rename from modules/Microsoft.KubernetesConfiguration/extensions/version.json rename to modules/KubernetesConfiguration/extensions/version.json diff --git a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.test/common/dependencies.bicep b/modules/KubernetesConfiguration/fluxConfigurations/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.test/common/dependencies.bicep rename to modules/KubernetesConfiguration/fluxConfigurations/.test/common/dependencies.bicep diff --git a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.test/common/main.test.bicep b/modules/KubernetesConfiguration/fluxConfigurations/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.test/common/main.test.bicep rename to modules/KubernetesConfiguration/fluxConfigurations/.test/common/main.test.bicep diff --git a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.test/min/dependencies.bicep b/modules/KubernetesConfiguration/fluxConfigurations/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.test/min/dependencies.bicep rename to modules/KubernetesConfiguration/fluxConfigurations/.test/min/dependencies.bicep diff --git a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.test/min/main.test.bicep b/modules/KubernetesConfiguration/fluxConfigurations/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.KubernetesConfiguration/fluxConfigurations/.test/min/main.test.bicep rename to modules/KubernetesConfiguration/fluxConfigurations/.test/min/main.test.bicep diff --git a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/readme.md b/modules/KubernetesConfiguration/fluxConfigurations/README.md similarity index 100% rename from modules/Microsoft.KubernetesConfiguration/fluxConfigurations/readme.md rename to modules/KubernetesConfiguration/fluxConfigurations/README.md diff --git a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/main.bicep b/modules/KubernetesConfiguration/fluxConfigurations/main.bicep similarity index 100% rename from modules/Microsoft.KubernetesConfiguration/fluxConfigurations/main.bicep rename to modules/KubernetesConfiguration/fluxConfigurations/main.bicep diff --git a/modules/Microsoft.KubernetesConfiguration/fluxConfigurations/version.json b/modules/KubernetesConfiguration/fluxConfigurations/version.json similarity index 100% rename from modules/Microsoft.KubernetesConfiguration/fluxConfigurations/version.json rename to modules/KubernetesConfiguration/fluxConfigurations/version.json diff --git a/modules/Microsoft.Logic/workflows/.bicep/nested_roleAssignments.bicep b/modules/Logic/workflows/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Logic/workflows/.bicep/nested_roleAssignments.bicep rename to modules/Logic/workflows/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Logic/workflows/.test/common/dependencies.bicep b/modules/Logic/workflows/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Logic/workflows/.test/common/dependencies.bicep rename to modules/Logic/workflows/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Logic/workflows/.test/common/main.test.bicep b/modules/Logic/workflows/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Logic/workflows/.test/common/main.test.bicep rename to modules/Logic/workflows/.test/common/main.test.bicep diff --git a/modules/Microsoft.Logic/workflows/readme.md b/modules/Logic/workflows/README.md similarity index 100% rename from modules/Microsoft.Logic/workflows/readme.md rename to modules/Logic/workflows/README.md diff --git a/modules/Microsoft.Logic/workflows/main.bicep b/modules/Logic/workflows/main.bicep similarity index 100% rename from modules/Microsoft.Logic/workflows/main.bicep rename to modules/Logic/workflows/main.bicep diff --git a/modules/Microsoft.Logic/workflows/version.json b/modules/Logic/workflows/version.json similarity index 100% rename from modules/Microsoft.Logic/workflows/version.json rename to modules/Logic/workflows/version.json diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.bicep/nested_roleAssignments.bicep b/modules/MachineLearningServices/workspaces/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.MachineLearningServices/workspaces/.bicep/nested_roleAssignments.bicep rename to modules/MachineLearningServices/workspaces/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.test/common/dependencies.bicep b/modules/MachineLearningServices/workspaces/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.MachineLearningServices/workspaces/.test/common/dependencies.bicep rename to modules/MachineLearningServices/workspaces/.test/common/dependencies.bicep diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.test/common/main.test.bicep b/modules/MachineLearningServices/workspaces/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.MachineLearningServices/workspaces/.test/common/main.test.bicep rename to modules/MachineLearningServices/workspaces/.test/common/main.test.bicep diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.test/encr/dependencies.bicep b/modules/MachineLearningServices/workspaces/.test/encr/dependencies.bicep similarity index 100% rename from modules/Microsoft.MachineLearningServices/workspaces/.test/encr/dependencies.bicep rename to modules/MachineLearningServices/workspaces/.test/encr/dependencies.bicep diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.test/encr/main.test.bicep b/modules/MachineLearningServices/workspaces/.test/encr/main.test.bicep similarity index 100% rename from modules/Microsoft.MachineLearningServices/workspaces/.test/encr/main.test.bicep rename to modules/MachineLearningServices/workspaces/.test/encr/main.test.bicep diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.test/min/dependencies.bicep b/modules/MachineLearningServices/workspaces/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.MachineLearningServices/workspaces/.test/min/dependencies.bicep rename to modules/MachineLearningServices/workspaces/.test/min/dependencies.bicep diff --git a/modules/Microsoft.MachineLearningServices/workspaces/.test/min/main.test.bicep b/modules/MachineLearningServices/workspaces/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.MachineLearningServices/workspaces/.test/min/main.test.bicep rename to modules/MachineLearningServices/workspaces/.test/min/main.test.bicep diff --git a/modules/Microsoft.MachineLearningServices/workspaces/readme.md b/modules/MachineLearningServices/workspaces/README.md similarity index 100% rename from modules/Microsoft.MachineLearningServices/workspaces/readme.md rename to modules/MachineLearningServices/workspaces/README.md diff --git a/modules/Microsoft.MachineLearningServices/workspaces/computes/readme.md b/modules/MachineLearningServices/workspaces/computes/README.md similarity index 100% rename from modules/Microsoft.MachineLearningServices/workspaces/computes/readme.md rename to modules/MachineLearningServices/workspaces/computes/README.md diff --git a/modules/Microsoft.MachineLearningServices/workspaces/computes/main.bicep b/modules/MachineLearningServices/workspaces/computes/main.bicep similarity index 100% rename from modules/Microsoft.MachineLearningServices/workspaces/computes/main.bicep rename to modules/MachineLearningServices/workspaces/computes/main.bicep diff --git a/modules/Microsoft.MachineLearningServices/workspaces/computes/version.json b/modules/MachineLearningServices/workspaces/computes/version.json similarity index 100% rename from modules/Microsoft.MachineLearningServices/workspaces/computes/version.json rename to modules/MachineLearningServices/workspaces/computes/version.json diff --git a/modules/Microsoft.MachineLearningServices/workspaces/main.bicep b/modules/MachineLearningServices/workspaces/main.bicep similarity index 100% rename from modules/Microsoft.MachineLearningServices/workspaces/main.bicep rename to modules/MachineLearningServices/workspaces/main.bicep diff --git a/modules/Microsoft.MachineLearningServices/workspaces/version.json b/modules/MachineLearningServices/workspaces/version.json similarity index 100% rename from modules/Microsoft.MachineLearningServices/workspaces/version.json rename to modules/MachineLearningServices/workspaces/version.json diff --git a/modules/Microsoft.Maintenance/maintenanceConfigurations/.bicep/nested_roleAssignments.bicep b/modules/Maintenance/maintenanceConfigurations/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Maintenance/maintenanceConfigurations/.bicep/nested_roleAssignments.bicep rename to modules/Maintenance/maintenanceConfigurations/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Maintenance/maintenanceConfigurations/.test/common/dependencies.bicep b/modules/Maintenance/maintenanceConfigurations/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Maintenance/maintenanceConfigurations/.test/common/dependencies.bicep rename to modules/Maintenance/maintenanceConfigurations/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Maintenance/maintenanceConfigurations/.test/common/main.test.bicep b/modules/Maintenance/maintenanceConfigurations/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Maintenance/maintenanceConfigurations/.test/common/main.test.bicep rename to modules/Maintenance/maintenanceConfigurations/.test/common/main.test.bicep diff --git a/modules/Microsoft.Maintenance/maintenanceConfigurations/.test/min/main.test.bicep b/modules/Maintenance/maintenanceConfigurations/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Maintenance/maintenanceConfigurations/.test/min/main.test.bicep rename to modules/Maintenance/maintenanceConfigurations/.test/min/main.test.bicep diff --git a/modules/Microsoft.Maintenance/maintenanceConfigurations/readme.md b/modules/Maintenance/maintenanceConfigurations/README.md similarity index 100% rename from modules/Microsoft.Maintenance/maintenanceConfigurations/readme.md rename to modules/Maintenance/maintenanceConfigurations/README.md diff --git a/modules/Microsoft.Maintenance/maintenanceConfigurations/main.bicep b/modules/Maintenance/maintenanceConfigurations/main.bicep similarity index 100% rename from modules/Microsoft.Maintenance/maintenanceConfigurations/main.bicep rename to modules/Maintenance/maintenanceConfigurations/main.bicep diff --git a/modules/Microsoft.Maintenance/maintenanceConfigurations/version.json b/modules/Maintenance/maintenanceConfigurations/version.json similarity index 100% rename from modules/Microsoft.Maintenance/maintenanceConfigurations/version.json rename to modules/Maintenance/maintenanceConfigurations/version.json diff --git a/modules/Microsoft.ManagedIdentity/userAssignedIdentities/.bicep/nested_roleAssignments.bicep b/modules/ManagedIdentity/userAssignedIdentities/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.ManagedIdentity/userAssignedIdentities/.bicep/nested_roleAssignments.bicep rename to modules/ManagedIdentity/userAssignedIdentities/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.ManagedIdentity/userAssignedIdentities/.test/common/dependencies.bicep b/modules/ManagedIdentity/userAssignedIdentities/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.ManagedIdentity/userAssignedIdentities/.test/common/dependencies.bicep rename to modules/ManagedIdentity/userAssignedIdentities/.test/common/dependencies.bicep diff --git a/modules/Microsoft.ManagedIdentity/userAssignedIdentities/.test/common/main.test.bicep b/modules/ManagedIdentity/userAssignedIdentities/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.ManagedIdentity/userAssignedIdentities/.test/common/main.test.bicep rename to modules/ManagedIdentity/userAssignedIdentities/.test/common/main.test.bicep diff --git a/modules/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md b/modules/ManagedIdentity/userAssignedIdentities/README.md similarity index 100% rename from modules/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md rename to modules/ManagedIdentity/userAssignedIdentities/README.md diff --git a/modules/Microsoft.ManagedIdentity/userAssignedIdentities/main.bicep b/modules/ManagedIdentity/userAssignedIdentities/main.bicep similarity index 100% rename from modules/Microsoft.ManagedIdentity/userAssignedIdentities/main.bicep rename to modules/ManagedIdentity/userAssignedIdentities/main.bicep diff --git a/modules/Microsoft.ManagedIdentity/userAssignedIdentities/version.json b/modules/ManagedIdentity/userAssignedIdentities/version.json similarity index 100% rename from modules/Microsoft.ManagedIdentity/userAssignedIdentities/version.json rename to modules/ManagedIdentity/userAssignedIdentities/version.json diff --git a/modules/Microsoft.ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep b/modules/ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep similarity index 100% rename from modules/Microsoft.ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep rename to modules/ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep diff --git a/modules/Microsoft.ManagedServices/registrationDefinitions/.test/common/main.test.bicep b/modules/ManagedServices/registrationDefinitions/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.ManagedServices/registrationDefinitions/.test/common/main.test.bicep rename to modules/ManagedServices/registrationDefinitions/.test/common/main.test.bicep diff --git a/modules/Microsoft.ManagedServices/registrationDefinitions/.test/rg/main.test.bicep b/modules/ManagedServices/registrationDefinitions/.test/rg/main.test.bicep similarity index 100% rename from modules/Microsoft.ManagedServices/registrationDefinitions/.test/rg/main.test.bicep rename to modules/ManagedServices/registrationDefinitions/.test/rg/main.test.bicep diff --git a/modules/Microsoft.ManagedServices/registrationDefinitions/readme.md b/modules/ManagedServices/registrationDefinitions/README.md similarity index 100% rename from modules/Microsoft.ManagedServices/registrationDefinitions/readme.md rename to modules/ManagedServices/registrationDefinitions/README.md diff --git a/modules/Microsoft.ManagedServices/registrationDefinitions/main.bicep b/modules/ManagedServices/registrationDefinitions/main.bicep similarity index 100% rename from modules/Microsoft.ManagedServices/registrationDefinitions/main.bicep rename to modules/ManagedServices/registrationDefinitions/main.bicep diff --git a/modules/Microsoft.ManagedServices/registrationDefinitions/version.json b/modules/ManagedServices/registrationDefinitions/version.json similarity index 100% rename from modules/Microsoft.ManagedServices/registrationDefinitions/version.json rename to modules/ManagedServices/registrationDefinitions/version.json diff --git a/modules/Microsoft.Management/managementGroups/.test/common/main.test.bicep b/modules/Management/managementGroups/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Management/managementGroups/.test/common/main.test.bicep rename to modules/Management/managementGroups/.test/common/main.test.bicep diff --git a/modules/Microsoft.Management/managementGroups/.test/min/main.test.bicep b/modules/Management/managementGroups/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Management/managementGroups/.test/min/main.test.bicep rename to modules/Management/managementGroups/.test/min/main.test.bicep diff --git a/modules/Microsoft.Management/managementGroups/readme.md b/modules/Management/managementGroups/README.md similarity index 100% rename from modules/Microsoft.Management/managementGroups/readme.md rename to modules/Management/managementGroups/README.md diff --git a/modules/Microsoft.Management/managementGroups/main.bicep b/modules/Management/managementGroups/main.bicep similarity index 100% rename from modules/Microsoft.Management/managementGroups/main.bicep rename to modules/Management/managementGroups/main.bicep diff --git a/modules/Microsoft.Management/managementGroups/version.json b/modules/Management/managementGroups/version.json similarity index 100% rename from modules/Microsoft.Management/managementGroups/version.json rename to modules/Management/managementGroups/version.json diff --git a/modules/Microsoft.NetApp/netAppAccounts/.bicep/nested_roleAssignments.bicep b/modules/NetApp/netAppAccounts/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.NetApp/netAppAccounts/.bicep/nested_roleAssignments.bicep rename to modules/NetApp/netAppAccounts/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/min/main.test.bicep b/modules/NetApp/netAppAccounts/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.NetApp/netAppAccounts/.test/min/main.test.bicep rename to modules/NetApp/netAppAccounts/.test/min/main.test.bicep diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/dependencies.bicep b/modules/NetApp/netAppAccounts/.test/nfs3/dependencies.bicep similarity index 100% rename from modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/dependencies.bicep rename to modules/NetApp/netAppAccounts/.test/nfs3/dependencies.bicep diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/main.test.bicep b/modules/NetApp/netAppAccounts/.test/nfs3/main.test.bicep similarity index 100% rename from modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/main.test.bicep rename to modules/NetApp/netAppAccounts/.test/nfs3/main.test.bicep diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/dependencies.bicep b/modules/NetApp/netAppAccounts/.test/nfs41/dependencies.bicep similarity index 100% rename from modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/dependencies.bicep rename to modules/NetApp/netAppAccounts/.test/nfs41/dependencies.bicep diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/main.test.bicep b/modules/NetApp/netAppAccounts/.test/nfs41/main.test.bicep similarity index 100% rename from modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/main.test.bicep rename to modules/NetApp/netAppAccounts/.test/nfs41/main.test.bicep diff --git a/modules/Microsoft.NetApp/netAppAccounts/readme.md b/modules/NetApp/netAppAccounts/README.md similarity index 100% rename from modules/Microsoft.NetApp/netAppAccounts/readme.md rename to modules/NetApp/netAppAccounts/README.md diff --git a/modules/Microsoft.NetApp/netAppAccounts/capacityPools/.bicep/nested_roleAssignments.bicep b/modules/NetApp/netAppAccounts/capacityPools/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.NetApp/netAppAccounts/capacityPools/.bicep/nested_roleAssignments.bicep rename to modules/NetApp/netAppAccounts/capacityPools/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md b/modules/NetApp/netAppAccounts/capacityPools/README.md similarity index 100% rename from modules/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md rename to modules/NetApp/netAppAccounts/capacityPools/README.md diff --git a/modules/Microsoft.NetApp/netAppAccounts/capacityPools/main.bicep b/modules/NetApp/netAppAccounts/capacityPools/main.bicep similarity index 100% rename from modules/Microsoft.NetApp/netAppAccounts/capacityPools/main.bicep rename to modules/NetApp/netAppAccounts/capacityPools/main.bicep diff --git a/modules/Microsoft.NetApp/netAppAccounts/capacityPools/version.json b/modules/NetApp/netAppAccounts/capacityPools/version.json similarity index 100% rename from modules/Microsoft.NetApp/netAppAccounts/capacityPools/version.json rename to modules/NetApp/netAppAccounts/capacityPools/version.json diff --git a/modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_roleAssignments.bicep b/modules/NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_roleAssignments.bicep rename to modules/NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md b/modules/NetApp/netAppAccounts/capacityPools/volumes/README.md similarity index 100% rename from modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md rename to modules/NetApp/netAppAccounts/capacityPools/volumes/README.md diff --git a/modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/main.bicep b/modules/NetApp/netAppAccounts/capacityPools/volumes/main.bicep similarity index 100% rename from modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/main.bicep rename to modules/NetApp/netAppAccounts/capacityPools/volumes/main.bicep diff --git a/modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json b/modules/NetApp/netAppAccounts/capacityPools/volumes/version.json similarity index 100% rename from modules/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json rename to modules/NetApp/netAppAccounts/capacityPools/volumes/version.json diff --git a/modules/Microsoft.NetApp/netAppAccounts/main.bicep b/modules/NetApp/netAppAccounts/main.bicep similarity index 100% rename from modules/Microsoft.NetApp/netAppAccounts/main.bicep rename to modules/NetApp/netAppAccounts/main.bicep diff --git a/modules/Microsoft.NetApp/netAppAccounts/version.json b/modules/NetApp/netAppAccounts/version.json similarity index 100% rename from modules/Microsoft.NetApp/netAppAccounts/version.json rename to modules/NetApp/netAppAccounts/version.json diff --git a/modules/Microsoft.OperationalInsights/workspaces/.bicep/nested_roleAssignments.bicep b/modules/OperationalInsights/workspaces/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/.bicep/nested_roleAssignments.bicep rename to modules/OperationalInsights/workspaces/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.OperationalInsights/workspaces/.test/adv/dependencies.bicep b/modules/OperationalInsights/workspaces/.test/adv/dependencies.bicep similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/.test/adv/dependencies.bicep rename to modules/OperationalInsights/workspaces/.test/adv/dependencies.bicep diff --git a/modules/Microsoft.OperationalInsights/workspaces/.test/adv/main.test.bicep b/modules/OperationalInsights/workspaces/.test/adv/main.test.bicep similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/.test/adv/main.test.bicep rename to modules/OperationalInsights/workspaces/.test/adv/main.test.bicep diff --git a/modules/Microsoft.OperationalInsights/workspaces/.test/common/dependencies.bicep b/modules/OperationalInsights/workspaces/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/.test/common/dependencies.bicep rename to modules/OperationalInsights/workspaces/.test/common/dependencies.bicep diff --git a/modules/Microsoft.OperationalInsights/workspaces/.test/common/main.test.bicep b/modules/OperationalInsights/workspaces/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/.test/common/main.test.bicep rename to modules/OperationalInsights/workspaces/.test/common/main.test.bicep diff --git a/modules/Microsoft.OperationalInsights/workspaces/.test/min/main.test.bicep b/modules/OperationalInsights/workspaces/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/.test/min/main.test.bicep rename to modules/OperationalInsights/workspaces/.test/min/main.test.bicep diff --git a/modules/Microsoft.OperationalInsights/workspaces/readme.md b/modules/OperationalInsights/workspaces/README.md similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/readme.md rename to modules/OperationalInsights/workspaces/README.md diff --git a/modules/Microsoft.OperationalInsights/workspaces/dataExports/readme.md b/modules/OperationalInsights/workspaces/dataExports/README.md similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/dataExports/readme.md rename to modules/OperationalInsights/workspaces/dataExports/README.md diff --git a/modules/Microsoft.OperationalInsights/workspaces/dataExports/main.bicep b/modules/OperationalInsights/workspaces/dataExports/main.bicep similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/dataExports/main.bicep rename to modules/OperationalInsights/workspaces/dataExports/main.bicep diff --git a/modules/Microsoft.OperationalInsights/workspaces/dataExports/version.json b/modules/OperationalInsights/workspaces/dataExports/version.json similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/dataExports/version.json rename to modules/OperationalInsights/workspaces/dataExports/version.json diff --git a/modules/Microsoft.OperationalInsights/workspaces/dataSources/readme.md b/modules/OperationalInsights/workspaces/dataSources/README.md similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/dataSources/readme.md rename to modules/OperationalInsights/workspaces/dataSources/README.md diff --git a/modules/Microsoft.OperationalInsights/workspaces/dataSources/main.bicep b/modules/OperationalInsights/workspaces/dataSources/main.bicep similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/dataSources/main.bicep rename to modules/OperationalInsights/workspaces/dataSources/main.bicep diff --git a/modules/Microsoft.OperationalInsights/workspaces/dataSources/version.json b/modules/OperationalInsights/workspaces/dataSources/version.json similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/dataSources/version.json rename to modules/OperationalInsights/workspaces/dataSources/version.json diff --git a/modules/Microsoft.OperationalInsights/workspaces/linkedServices/readme.md b/modules/OperationalInsights/workspaces/linkedServices/README.md similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/linkedServices/readme.md rename to modules/OperationalInsights/workspaces/linkedServices/README.md diff --git a/modules/Microsoft.OperationalInsights/workspaces/linkedServices/main.bicep b/modules/OperationalInsights/workspaces/linkedServices/main.bicep similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/linkedServices/main.bicep rename to modules/OperationalInsights/workspaces/linkedServices/main.bicep diff --git a/modules/Microsoft.OperationalInsights/workspaces/linkedServices/version.json b/modules/OperationalInsights/workspaces/linkedServices/version.json similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/linkedServices/version.json rename to modules/OperationalInsights/workspaces/linkedServices/version.json diff --git a/modules/Microsoft.OperationalInsights/workspaces/linkedStorageAccounts/readme.md b/modules/OperationalInsights/workspaces/linkedStorageAccounts/README.md similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/linkedStorageAccounts/readme.md rename to modules/OperationalInsights/workspaces/linkedStorageAccounts/README.md diff --git a/modules/Microsoft.OperationalInsights/workspaces/linkedStorageAccounts/main.bicep b/modules/OperationalInsights/workspaces/linkedStorageAccounts/main.bicep similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/linkedStorageAccounts/main.bicep rename to modules/OperationalInsights/workspaces/linkedStorageAccounts/main.bicep diff --git a/modules/Microsoft.OperationalInsights/workspaces/linkedStorageAccounts/version.json b/modules/OperationalInsights/workspaces/linkedStorageAccounts/version.json similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/linkedStorageAccounts/version.json rename to modules/OperationalInsights/workspaces/linkedStorageAccounts/version.json diff --git a/modules/Microsoft.OperationalInsights/workspaces/main.bicep b/modules/OperationalInsights/workspaces/main.bicep similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/main.bicep rename to modules/OperationalInsights/workspaces/main.bicep diff --git a/modules/Microsoft.OperationalInsights/workspaces/savedSearches/readme.md b/modules/OperationalInsights/workspaces/savedSearches/README.md similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/savedSearches/readme.md rename to modules/OperationalInsights/workspaces/savedSearches/README.md diff --git a/modules/Microsoft.OperationalInsights/workspaces/savedSearches/main.bicep b/modules/OperationalInsights/workspaces/savedSearches/main.bicep similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/savedSearches/main.bicep rename to modules/OperationalInsights/workspaces/savedSearches/main.bicep diff --git a/modules/Microsoft.OperationalInsights/workspaces/savedSearches/version.json b/modules/OperationalInsights/workspaces/savedSearches/version.json similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/savedSearches/version.json rename to modules/OperationalInsights/workspaces/savedSearches/version.json diff --git a/modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/readme.md b/modules/OperationalInsights/workspaces/storageInsightConfigs/README.md similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/readme.md rename to modules/OperationalInsights/workspaces/storageInsightConfigs/README.md diff --git a/modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/main.bicep b/modules/OperationalInsights/workspaces/storageInsightConfigs/main.bicep similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/main.bicep rename to modules/OperationalInsights/workspaces/storageInsightConfigs/main.bicep diff --git a/modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json b/modules/OperationalInsights/workspaces/storageInsightConfigs/version.json similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json rename to modules/OperationalInsights/workspaces/storageInsightConfigs/version.json diff --git a/modules/Microsoft.OperationalInsights/workspaces/tables/readme.md b/modules/OperationalInsights/workspaces/tables/README.md similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/tables/readme.md rename to modules/OperationalInsights/workspaces/tables/README.md diff --git a/modules/Microsoft.OperationalInsights/workspaces/tables/main.bicep b/modules/OperationalInsights/workspaces/tables/main.bicep similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/tables/main.bicep rename to modules/OperationalInsights/workspaces/tables/main.bicep diff --git a/modules/Microsoft.OperationalInsights/workspaces/tables/version.json b/modules/OperationalInsights/workspaces/tables/version.json similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/tables/version.json rename to modules/OperationalInsights/workspaces/tables/version.json diff --git a/modules/Microsoft.OperationalInsights/workspaces/version.json b/modules/OperationalInsights/workspaces/version.json similarity index 100% rename from modules/Microsoft.OperationalInsights/workspaces/version.json rename to modules/OperationalInsights/workspaces/version.json diff --git a/modules/Microsoft.OperationsManagement/solutions/.test/min/dependencies.bicep b/modules/OperationsManagement/solutions/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.OperationsManagement/solutions/.test/min/dependencies.bicep rename to modules/OperationsManagement/solutions/.test/min/dependencies.bicep diff --git a/modules/Microsoft.OperationsManagement/solutions/.test/min/main.test.bicep b/modules/OperationsManagement/solutions/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.OperationsManagement/solutions/.test/min/main.test.bicep rename to modules/OperationsManagement/solutions/.test/min/main.test.bicep diff --git a/modules/Microsoft.OperationsManagement/solutions/.test/ms/dependencies.bicep b/modules/OperationsManagement/solutions/.test/ms/dependencies.bicep similarity index 100% rename from modules/Microsoft.OperationsManagement/solutions/.test/ms/dependencies.bicep rename to modules/OperationsManagement/solutions/.test/ms/dependencies.bicep diff --git a/modules/Microsoft.OperationsManagement/solutions/.test/ms/main.test.bicep b/modules/OperationsManagement/solutions/.test/ms/main.test.bicep similarity index 100% rename from modules/Microsoft.OperationsManagement/solutions/.test/ms/main.test.bicep rename to modules/OperationsManagement/solutions/.test/ms/main.test.bicep diff --git a/modules/Microsoft.OperationsManagement/solutions/.test/nonms/dependencies.bicep b/modules/OperationsManagement/solutions/.test/nonms/dependencies.bicep similarity index 100% rename from modules/Microsoft.OperationsManagement/solutions/.test/nonms/dependencies.bicep rename to modules/OperationsManagement/solutions/.test/nonms/dependencies.bicep diff --git a/modules/Microsoft.OperationsManagement/solutions/.test/nonms/main.test.bicep b/modules/OperationsManagement/solutions/.test/nonms/main.test.bicep similarity index 100% rename from modules/Microsoft.OperationsManagement/solutions/.test/nonms/main.test.bicep rename to modules/OperationsManagement/solutions/.test/nonms/main.test.bicep diff --git a/modules/Microsoft.OperationsManagement/solutions/readme.md b/modules/OperationsManagement/solutions/README.md similarity index 100% rename from modules/Microsoft.OperationsManagement/solutions/readme.md rename to modules/OperationsManagement/solutions/README.md diff --git a/modules/Microsoft.OperationsManagement/solutions/main.bicep b/modules/OperationsManagement/solutions/main.bicep similarity index 100% rename from modules/Microsoft.OperationsManagement/solutions/main.bicep rename to modules/OperationsManagement/solutions/main.bicep diff --git a/modules/Microsoft.OperationsManagement/solutions/version.json b/modules/OperationsManagement/solutions/version.json similarity index 100% rename from modules/Microsoft.OperationsManagement/solutions/version.json rename to modules/OperationsManagement/solutions/version.json diff --git a/modules/Microsoft.PolicyInsights/remediations/.test/mg.common/main.test.bicep b/modules/PolicyInsights/remediations/.test/mg.common/main.test.bicep similarity index 100% rename from modules/Microsoft.PolicyInsights/remediations/.test/mg.common/main.test.bicep rename to modules/PolicyInsights/remediations/.test/mg.common/main.test.bicep diff --git a/modules/Microsoft.PolicyInsights/remediations/.test/mg.min/main.test.bicep b/modules/PolicyInsights/remediations/.test/mg.min/main.test.bicep similarity index 100% rename from modules/Microsoft.PolicyInsights/remediations/.test/mg.min/main.test.bicep rename to modules/PolicyInsights/remediations/.test/mg.min/main.test.bicep diff --git a/modules/Microsoft.PolicyInsights/remediations/.test/rg.common/main.test.bicep b/modules/PolicyInsights/remediations/.test/rg.common/main.test.bicep similarity index 100% rename from modules/Microsoft.PolicyInsights/remediations/.test/rg.common/main.test.bicep rename to modules/PolicyInsights/remediations/.test/rg.common/main.test.bicep diff --git a/modules/Microsoft.PolicyInsights/remediations/.test/rg.min/main.test.bicep b/modules/PolicyInsights/remediations/.test/rg.min/main.test.bicep similarity index 100% rename from modules/Microsoft.PolicyInsights/remediations/.test/rg.min/main.test.bicep rename to modules/PolicyInsights/remediations/.test/rg.min/main.test.bicep diff --git a/modules/Microsoft.PolicyInsights/remediations/.test/sub.common/main.test.bicep b/modules/PolicyInsights/remediations/.test/sub.common/main.test.bicep similarity index 100% rename from modules/Microsoft.PolicyInsights/remediations/.test/sub.common/main.test.bicep rename to modules/PolicyInsights/remediations/.test/sub.common/main.test.bicep diff --git a/modules/Microsoft.PolicyInsights/remediations/.test/sub.min/main.test.bicep b/modules/PolicyInsights/remediations/.test/sub.min/main.test.bicep similarity index 100% rename from modules/Microsoft.PolicyInsights/remediations/.test/sub.min/main.test.bicep rename to modules/PolicyInsights/remediations/.test/sub.min/main.test.bicep diff --git a/modules/Microsoft.PolicyInsights/remediations/readme.md b/modules/PolicyInsights/remediations/README.md similarity index 100% rename from modules/Microsoft.PolicyInsights/remediations/readme.md rename to modules/PolicyInsights/remediations/README.md diff --git a/modules/Microsoft.PolicyInsights/remediations/main.bicep b/modules/PolicyInsights/remediations/main.bicep similarity index 100% rename from modules/Microsoft.PolicyInsights/remediations/main.bicep rename to modules/PolicyInsights/remediations/main.bicep diff --git a/modules/Microsoft.PolicyInsights/remediations/managementGroup/readme.md b/modules/PolicyInsights/remediations/managementGroup/README.md similarity index 100% rename from modules/Microsoft.PolicyInsights/remediations/managementGroup/readme.md rename to modules/PolicyInsights/remediations/managementGroup/README.md diff --git a/modules/Microsoft.PolicyInsights/remediations/managementGroup/main.bicep b/modules/PolicyInsights/remediations/managementGroup/main.bicep similarity index 100% rename from modules/Microsoft.PolicyInsights/remediations/managementGroup/main.bicep rename to modules/PolicyInsights/remediations/managementGroup/main.bicep diff --git a/modules/Microsoft.PolicyInsights/remediations/managementGroup/version.json b/modules/PolicyInsights/remediations/managementGroup/version.json similarity index 100% rename from modules/Microsoft.PolicyInsights/remediations/managementGroup/version.json rename to modules/PolicyInsights/remediations/managementGroup/version.json diff --git a/modules/Microsoft.PolicyInsights/remediations/resourceGroup/readme.md b/modules/PolicyInsights/remediations/resourceGroup/README.md similarity index 100% rename from modules/Microsoft.PolicyInsights/remediations/resourceGroup/readme.md rename to modules/PolicyInsights/remediations/resourceGroup/README.md diff --git a/modules/Microsoft.PolicyInsights/remediations/resourceGroup/main.bicep b/modules/PolicyInsights/remediations/resourceGroup/main.bicep similarity index 100% rename from modules/Microsoft.PolicyInsights/remediations/resourceGroup/main.bicep rename to modules/PolicyInsights/remediations/resourceGroup/main.bicep diff --git a/modules/Microsoft.PolicyInsights/remediations/resourceGroup/version.json b/modules/PolicyInsights/remediations/resourceGroup/version.json similarity index 100% rename from modules/Microsoft.PolicyInsights/remediations/resourceGroup/version.json rename to modules/PolicyInsights/remediations/resourceGroup/version.json diff --git a/modules/Microsoft.PolicyInsights/remediations/subscription/readme.md b/modules/PolicyInsights/remediations/subscription/README.md similarity index 100% rename from modules/Microsoft.PolicyInsights/remediations/subscription/readme.md rename to modules/PolicyInsights/remediations/subscription/README.md diff --git a/modules/Microsoft.PolicyInsights/remediations/subscription/main.bicep b/modules/PolicyInsights/remediations/subscription/main.bicep similarity index 100% rename from modules/Microsoft.PolicyInsights/remediations/subscription/main.bicep rename to modules/PolicyInsights/remediations/subscription/main.bicep diff --git a/modules/Microsoft.PolicyInsights/remediations/subscription/version.json b/modules/PolicyInsights/remediations/subscription/version.json similarity index 100% rename from modules/Microsoft.PolicyInsights/remediations/subscription/version.json rename to modules/PolicyInsights/remediations/subscription/version.json diff --git a/modules/Microsoft.PolicyInsights/remediations/version.json b/modules/PolicyInsights/remediations/version.json similarity index 100% rename from modules/Microsoft.PolicyInsights/remediations/version.json rename to modules/PolicyInsights/remediations/version.json diff --git a/modules/Microsoft.PowerBIDedicated/capacities/.bicep/nested_roleAssignments.bicep b/modules/PowerBIDedicated/capacities/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.PowerBIDedicated/capacities/.bicep/nested_roleAssignments.bicep rename to modules/PowerBIDedicated/capacities/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.PowerBIDedicated/capacities/.test/common/dependencies.bicep b/modules/PowerBIDedicated/capacities/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.PowerBIDedicated/capacities/.test/common/dependencies.bicep rename to modules/PowerBIDedicated/capacities/.test/common/dependencies.bicep diff --git a/modules/Microsoft.PowerBIDedicated/capacities/.test/common/main.test.bicep b/modules/PowerBIDedicated/capacities/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.PowerBIDedicated/capacities/.test/common/main.test.bicep rename to modules/PowerBIDedicated/capacities/.test/common/main.test.bicep diff --git a/modules/Microsoft.PowerBIDedicated/capacities/.test/min/dependencies.bicep b/modules/PowerBIDedicated/capacities/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.PowerBIDedicated/capacities/.test/min/dependencies.bicep rename to modules/PowerBIDedicated/capacities/.test/min/dependencies.bicep diff --git a/modules/Microsoft.PowerBIDedicated/capacities/.test/min/main.test.bicep b/modules/PowerBIDedicated/capacities/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.PowerBIDedicated/capacities/.test/min/main.test.bicep rename to modules/PowerBIDedicated/capacities/.test/min/main.test.bicep diff --git a/modules/Microsoft.PowerBIDedicated/capacities/readme.md b/modules/PowerBIDedicated/capacities/README.md similarity index 100% rename from modules/Microsoft.PowerBIDedicated/capacities/readme.md rename to modules/PowerBIDedicated/capacities/README.md diff --git a/modules/Microsoft.PowerBIDedicated/capacities/main.bicep b/modules/PowerBIDedicated/capacities/main.bicep similarity index 100% rename from modules/Microsoft.PowerBIDedicated/capacities/main.bicep rename to modules/PowerBIDedicated/capacities/main.bicep diff --git a/modules/Microsoft.PowerBIDedicated/capacities/version.json b/modules/PowerBIDedicated/capacities/version.json similarity index 100% rename from modules/Microsoft.PowerBIDedicated/capacities/version.json rename to modules/PowerBIDedicated/capacities/version.json diff --git a/modules/Microsoft.Purview/accounts/.bicep/nested_roleAssignments.bicep b/modules/Purview/accounts/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Purview/accounts/.bicep/nested_roleAssignments.bicep rename to modules/Purview/accounts/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Purview/accounts/.test/common/dependencies.bicep b/modules/Purview/accounts/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Purview/accounts/.test/common/dependencies.bicep rename to modules/Purview/accounts/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Purview/accounts/.test/common/main.test.bicep b/modules/Purview/accounts/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Purview/accounts/.test/common/main.test.bicep rename to modules/Purview/accounts/.test/common/main.test.bicep diff --git a/modules/Microsoft.Purview/accounts/.test/min/main.test.bicep b/modules/Purview/accounts/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Purview/accounts/.test/min/main.test.bicep rename to modules/Purview/accounts/.test/min/main.test.bicep diff --git a/modules/Microsoft.Purview/accounts/readme.md b/modules/Purview/accounts/README.md similarity index 100% rename from modules/Microsoft.Purview/accounts/readme.md rename to modules/Purview/accounts/README.md diff --git a/modules/Microsoft.Purview/accounts/main.bicep b/modules/Purview/accounts/main.bicep similarity index 100% rename from modules/Microsoft.Purview/accounts/main.bicep rename to modules/Purview/accounts/main.bicep diff --git a/modules/Microsoft.Purview/accounts/version.json b/modules/Purview/accounts/version.json similarity index 100% rename from modules/Microsoft.Purview/accounts/version.json rename to modules/Purview/accounts/version.json diff --git a/modules/Microsoft.RecoveryServices/vaults/.bicep/nested_roleAssignments.bicep b/modules/RecoveryServices/vaults/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/.bicep/nested_roleAssignments.bicep rename to modules/RecoveryServices/vaults/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.RecoveryServices/vaults/.test/common/dependencies.bicep b/modules/RecoveryServices/vaults/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/.test/common/dependencies.bicep rename to modules/RecoveryServices/vaults/.test/common/dependencies.bicep diff --git a/modules/Microsoft.RecoveryServices/vaults/.test/common/main.test.bicep b/modules/RecoveryServices/vaults/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/.test/common/main.test.bicep rename to modules/RecoveryServices/vaults/.test/common/main.test.bicep diff --git a/modules/Microsoft.RecoveryServices/vaults/.test/dr/main.test.bicep b/modules/RecoveryServices/vaults/.test/dr/main.test.bicep similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/.test/dr/main.test.bicep rename to modules/RecoveryServices/vaults/.test/dr/main.test.bicep diff --git a/modules/Microsoft.RecoveryServices/vaults/.test/min/main.test.bicep b/modules/RecoveryServices/vaults/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/.test/min/main.test.bicep rename to modules/RecoveryServices/vaults/.test/min/main.test.bicep diff --git a/modules/Microsoft.RecoveryServices/vaults/readme.md b/modules/RecoveryServices/vaults/README.md similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/readme.md rename to modules/RecoveryServices/vaults/README.md diff --git a/modules/Microsoft.RecoveryServices/vaults/backupConfig/readme.md b/modules/RecoveryServices/vaults/backupConfig/README.md similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/backupConfig/readme.md rename to modules/RecoveryServices/vaults/backupConfig/README.md diff --git a/modules/Microsoft.RecoveryServices/vaults/backupConfig/main.bicep b/modules/RecoveryServices/vaults/backupConfig/main.bicep similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/backupConfig/main.bicep rename to modules/RecoveryServices/vaults/backupConfig/main.bicep diff --git a/modules/Microsoft.RecoveryServices/vaults/backupConfig/version.json b/modules/RecoveryServices/vaults/backupConfig/version.json similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/backupConfig/version.json rename to modules/RecoveryServices/vaults/backupConfig/version.json diff --git a/modules/Microsoft.RecoveryServices/vaults/backupPolicies/readme.md b/modules/RecoveryServices/vaults/backupPolicies/README.md similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/backupPolicies/readme.md rename to modules/RecoveryServices/vaults/backupPolicies/README.md diff --git a/modules/Microsoft.RecoveryServices/vaults/backupPolicies/main.bicep b/modules/RecoveryServices/vaults/backupPolicies/main.bicep similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/backupPolicies/main.bicep rename to modules/RecoveryServices/vaults/backupPolicies/main.bicep diff --git a/modules/Microsoft.RecoveryServices/vaults/backupPolicies/version.json b/modules/RecoveryServices/vaults/backupPolicies/version.json similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/backupPolicies/version.json rename to modules/RecoveryServices/vaults/backupPolicies/version.json diff --git a/modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/readme.md b/modules/RecoveryServices/vaults/backupStorageConfig/README.md similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/readme.md rename to modules/RecoveryServices/vaults/backupStorageConfig/README.md diff --git a/modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/main.bicep b/modules/RecoveryServices/vaults/backupStorageConfig/main.bicep similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/main.bicep rename to modules/RecoveryServices/vaults/backupStorageConfig/main.bicep diff --git a/modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json b/modules/RecoveryServices/vaults/backupStorageConfig/version.json similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json rename to modules/RecoveryServices/vaults/backupStorageConfig/version.json diff --git a/modules/Microsoft.RecoveryServices/vaults/main.bicep b/modules/RecoveryServices/vaults/main.bicep similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/main.bicep rename to modules/RecoveryServices/vaults/main.bicep diff --git a/modules/Microsoft.RecoveryServices/vaults/protectionContainers/readme.md b/modules/RecoveryServices/vaults/protectionContainers/README.md similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/protectionContainers/readme.md rename to modules/RecoveryServices/vaults/protectionContainers/README.md diff --git a/modules/Microsoft.RecoveryServices/vaults/protectionContainers/main.bicep b/modules/RecoveryServices/vaults/protectionContainers/main.bicep similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/protectionContainers/main.bicep rename to modules/RecoveryServices/vaults/protectionContainers/main.bicep diff --git a/modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/readme.md b/modules/RecoveryServices/vaults/protectionContainers/protectedItems/README.md similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/readme.md rename to modules/RecoveryServices/vaults/protectionContainers/protectedItems/README.md diff --git a/modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/main.bicep b/modules/RecoveryServices/vaults/protectionContainers/protectedItems/main.bicep similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/main.bicep rename to modules/RecoveryServices/vaults/protectionContainers/protectedItems/main.bicep diff --git a/modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/version.json b/modules/RecoveryServices/vaults/protectionContainers/protectedItems/version.json similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/protectionContainers/protectedItems/version.json rename to modules/RecoveryServices/vaults/protectionContainers/protectedItems/version.json diff --git a/modules/Microsoft.RecoveryServices/vaults/protectionContainers/version.json b/modules/RecoveryServices/vaults/protectionContainers/version.json similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/protectionContainers/version.json rename to modules/RecoveryServices/vaults/protectionContainers/version.json diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationAlertSettings/readme.md b/modules/RecoveryServices/vaults/replicationAlertSettings/README.md similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/replicationAlertSettings/readme.md rename to modules/RecoveryServices/vaults/replicationAlertSettings/README.md diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationAlertSettings/main.bicep b/modules/RecoveryServices/vaults/replicationAlertSettings/main.bicep similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/replicationAlertSettings/main.bicep rename to modules/RecoveryServices/vaults/replicationAlertSettings/main.bicep diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationAlertSettings/version.json b/modules/RecoveryServices/vaults/replicationAlertSettings/version.json similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/replicationAlertSettings/version.json rename to modules/RecoveryServices/vaults/replicationAlertSettings/version.json diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/readme.md b/modules/RecoveryServices/vaults/replicationFabrics/README.md similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/replicationFabrics/readme.md rename to modules/RecoveryServices/vaults/replicationFabrics/README.md diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/main.bicep b/modules/RecoveryServices/vaults/replicationFabrics/main.bicep similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/replicationFabrics/main.bicep rename to modules/RecoveryServices/vaults/replicationFabrics/main.bicep diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/readme.md b/modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/README.md similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/readme.md rename to modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/README.md diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/main.bicep b/modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/main.bicep similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/main.bicep rename to modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/main.bicep diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/readme.md b/modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/README.md similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/readme.md rename to modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/README.md diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/main.bicep b/modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/main.bicep similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/main.bicep rename to modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/main.bicep diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/version.json b/modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/version.json similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/version.json rename to modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings/version.json diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/version.json b/modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/version.json similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/version.json rename to modules/RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/version.json diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationFabrics/version.json b/modules/RecoveryServices/vaults/replicationFabrics/version.json similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/replicationFabrics/version.json rename to modules/RecoveryServices/vaults/replicationFabrics/version.json diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationPolicies/readme.md b/modules/RecoveryServices/vaults/replicationPolicies/README.md similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/replicationPolicies/readme.md rename to modules/RecoveryServices/vaults/replicationPolicies/README.md diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationPolicies/main.bicep b/modules/RecoveryServices/vaults/replicationPolicies/main.bicep similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/replicationPolicies/main.bicep rename to modules/RecoveryServices/vaults/replicationPolicies/main.bicep diff --git a/modules/Microsoft.RecoveryServices/vaults/replicationPolicies/version.json b/modules/RecoveryServices/vaults/replicationPolicies/version.json similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/replicationPolicies/version.json rename to modules/RecoveryServices/vaults/replicationPolicies/version.json diff --git a/modules/Microsoft.RecoveryServices/vaults/version.json b/modules/RecoveryServices/vaults/version.json similarity index 100% rename from modules/Microsoft.RecoveryServices/vaults/version.json rename to modules/RecoveryServices/vaults/version.json diff --git a/modules/Microsoft.Resources/deploymentScripts/.test/cli/dependencies.bicep b/modules/Resources/deploymentScripts/.test/cli/dependencies.bicep similarity index 100% rename from modules/Microsoft.Resources/deploymentScripts/.test/cli/dependencies.bicep rename to modules/Resources/deploymentScripts/.test/cli/dependencies.bicep diff --git a/modules/Microsoft.Resources/deploymentScripts/.test/cli/main.test.bicep b/modules/Resources/deploymentScripts/.test/cli/main.test.bicep similarity index 100% rename from modules/Microsoft.Resources/deploymentScripts/.test/cli/main.test.bicep rename to modules/Resources/deploymentScripts/.test/cli/main.test.bicep diff --git a/modules/Microsoft.Resources/deploymentScripts/.test/ps/dependencies.bicep b/modules/Resources/deploymentScripts/.test/ps/dependencies.bicep similarity index 100% rename from modules/Microsoft.Resources/deploymentScripts/.test/ps/dependencies.bicep rename to modules/Resources/deploymentScripts/.test/ps/dependencies.bicep diff --git a/modules/Microsoft.Resources/deploymentScripts/.test/ps/main.test.bicep b/modules/Resources/deploymentScripts/.test/ps/main.test.bicep similarity index 100% rename from modules/Microsoft.Resources/deploymentScripts/.test/ps/main.test.bicep rename to modules/Resources/deploymentScripts/.test/ps/main.test.bicep diff --git a/modules/Microsoft.Resources/deploymentScripts/readme.md b/modules/Resources/deploymentScripts/README.md similarity index 100% rename from modules/Microsoft.Resources/deploymentScripts/readme.md rename to modules/Resources/deploymentScripts/README.md diff --git a/modules/Microsoft.Resources/deploymentScripts/main.bicep b/modules/Resources/deploymentScripts/main.bicep similarity index 100% rename from modules/Microsoft.Resources/deploymentScripts/main.bicep rename to modules/Resources/deploymentScripts/main.bicep diff --git a/modules/Microsoft.Resources/deploymentScripts/version.json b/modules/Resources/deploymentScripts/version.json similarity index 100% rename from modules/Microsoft.Resources/deploymentScripts/version.json rename to modules/Resources/deploymentScripts/version.json diff --git a/modules/Microsoft.Resources/resourceGroups/.bicep/nested_roleAssignments.bicep b/modules/Resources/resourceGroups/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Resources/resourceGroups/.bicep/nested_roleAssignments.bicep rename to modules/Resources/resourceGroups/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Resources/resourceGroups/.test/common/dependencies.bicep b/modules/Resources/resourceGroups/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Resources/resourceGroups/.test/common/dependencies.bicep rename to modules/Resources/resourceGroups/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Resources/resourceGroups/.test/common/main.test.bicep b/modules/Resources/resourceGroups/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Resources/resourceGroups/.test/common/main.test.bicep rename to modules/Resources/resourceGroups/.test/common/main.test.bicep diff --git a/modules/Microsoft.Resources/resourceGroups/.test/min/main.test.bicep b/modules/Resources/resourceGroups/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Resources/resourceGroups/.test/min/main.test.bicep rename to modules/Resources/resourceGroups/.test/min/main.test.bicep diff --git a/modules/Microsoft.Resources/resourceGroups/readme.md b/modules/Resources/resourceGroups/README.md similarity index 100% rename from modules/Microsoft.Resources/resourceGroups/readme.md rename to modules/Resources/resourceGroups/README.md diff --git a/modules/Microsoft.Resources/resourceGroups/main.bicep b/modules/Resources/resourceGroups/main.bicep similarity index 100% rename from modules/Microsoft.Resources/resourceGroups/main.bicep rename to modules/Resources/resourceGroups/main.bicep diff --git a/modules/Microsoft.Resources/resourceGroups/version.json b/modules/Resources/resourceGroups/version.json similarity index 100% rename from modules/Microsoft.Resources/resourceGroups/version.json rename to modules/Resources/resourceGroups/version.json diff --git a/modules/Microsoft.Resources/tags/.test/min/main.test.bicep b/modules/Resources/tags/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Resources/tags/.test/min/main.test.bicep rename to modules/Resources/tags/.test/min/main.test.bicep diff --git a/modules/Microsoft.Resources/tags/.test/rg/main.test.bicep b/modules/Resources/tags/.test/rg/main.test.bicep similarity index 100% rename from modules/Microsoft.Resources/tags/.test/rg/main.test.bicep rename to modules/Resources/tags/.test/rg/main.test.bicep diff --git a/modules/Microsoft.Resources/tags/.test/sub/main.test.bicep b/modules/Resources/tags/.test/sub/main.test.bicep similarity index 100% rename from modules/Microsoft.Resources/tags/.test/sub/main.test.bicep rename to modules/Resources/tags/.test/sub/main.test.bicep diff --git a/modules/Microsoft.Resources/tags/readme.md b/modules/Resources/tags/README.md similarity index 100% rename from modules/Microsoft.Resources/tags/readme.md rename to modules/Resources/tags/README.md diff --git a/modules/Microsoft.Resources/tags/main.bicep b/modules/Resources/tags/main.bicep similarity index 100% rename from modules/Microsoft.Resources/tags/main.bicep rename to modules/Resources/tags/main.bicep diff --git a/modules/Microsoft.Resources/tags/resourceGroups/.bicep/readTags.bicep b/modules/Resources/tags/resourceGroups/.bicep/readTags.bicep similarity index 100% rename from modules/Microsoft.Resources/tags/resourceGroups/.bicep/readTags.bicep rename to modules/Resources/tags/resourceGroups/.bicep/readTags.bicep diff --git a/modules/Microsoft.Resources/tags/resourceGroups/readme.md b/modules/Resources/tags/resourceGroups/README.md similarity index 100% rename from modules/Microsoft.Resources/tags/resourceGroups/readme.md rename to modules/Resources/tags/resourceGroups/README.md diff --git a/modules/Microsoft.Resources/tags/resourceGroups/main.bicep b/modules/Resources/tags/resourceGroups/main.bicep similarity index 100% rename from modules/Microsoft.Resources/tags/resourceGroups/main.bicep rename to modules/Resources/tags/resourceGroups/main.bicep diff --git a/modules/Microsoft.Resources/tags/resourceGroups/version.json b/modules/Resources/tags/resourceGroups/version.json similarity index 100% rename from modules/Microsoft.Resources/tags/resourceGroups/version.json rename to modules/Resources/tags/resourceGroups/version.json diff --git a/modules/Microsoft.Resources/tags/subscriptions/.bicep/readTags.bicep b/modules/Resources/tags/subscriptions/.bicep/readTags.bicep similarity index 100% rename from modules/Microsoft.Resources/tags/subscriptions/.bicep/readTags.bicep rename to modules/Resources/tags/subscriptions/.bicep/readTags.bicep diff --git a/modules/Microsoft.Resources/tags/subscriptions/readme.md b/modules/Resources/tags/subscriptions/README.md similarity index 100% rename from modules/Microsoft.Resources/tags/subscriptions/readme.md rename to modules/Resources/tags/subscriptions/README.md diff --git a/modules/Microsoft.Resources/tags/subscriptions/main.bicep b/modules/Resources/tags/subscriptions/main.bicep similarity index 100% rename from modules/Microsoft.Resources/tags/subscriptions/main.bicep rename to modules/Resources/tags/subscriptions/main.bicep diff --git a/modules/Microsoft.Resources/tags/subscriptions/version.json b/modules/Resources/tags/subscriptions/version.json similarity index 100% rename from modules/Microsoft.Resources/tags/subscriptions/version.json rename to modules/Resources/tags/subscriptions/version.json diff --git a/modules/Microsoft.Resources/tags/version.json b/modules/Resources/tags/version.json similarity index 100% rename from modules/Microsoft.Resources/tags/version.json rename to modules/Resources/tags/version.json diff --git a/modules/Microsoft.Security/azureSecurityCenter/.bicep/nested_iotSecuritySolutions.bicep b/modules/Security/azureSecurityCenter/.bicep/nested_iotSecuritySolutions.bicep similarity index 100% rename from modules/Microsoft.Security/azureSecurityCenter/.bicep/nested_iotSecuritySolutions.bicep rename to modules/Security/azureSecurityCenter/.bicep/nested_iotSecuritySolutions.bicep diff --git a/modules/Microsoft.Security/azureSecurityCenter/.test/common/dependencies.bicep b/modules/Security/azureSecurityCenter/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Security/azureSecurityCenter/.test/common/dependencies.bicep rename to modules/Security/azureSecurityCenter/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Security/azureSecurityCenter/.test/common/main.test.bicep b/modules/Security/azureSecurityCenter/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Security/azureSecurityCenter/.test/common/main.test.bicep rename to modules/Security/azureSecurityCenter/.test/common/main.test.bicep diff --git a/modules/Microsoft.Security/azureSecurityCenter/readme.md b/modules/Security/azureSecurityCenter/README.md similarity index 100% rename from modules/Microsoft.Security/azureSecurityCenter/readme.md rename to modules/Security/azureSecurityCenter/README.md diff --git a/modules/Microsoft.Security/azureSecurityCenter/main.bicep b/modules/Security/azureSecurityCenter/main.bicep similarity index 100% rename from modules/Microsoft.Security/azureSecurityCenter/main.bicep rename to modules/Security/azureSecurityCenter/main.bicep diff --git a/modules/Microsoft.Security/azureSecurityCenter/version.json b/modules/Security/azureSecurityCenter/version.json similarity index 100% rename from modules/Microsoft.Security/azureSecurityCenter/version.json rename to modules/Security/azureSecurityCenter/version.json diff --git a/modules/Microsoft.ServiceBus/namespaces/.bicep/nested_roleAssignments.bicep b/modules/ServiceBus/namespaces/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/.bicep/nested_roleAssignments.bicep rename to modules/ServiceBus/namespaces/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.ServiceBus/namespaces/.test/common/dependencies.bicep b/modules/ServiceBus/namespaces/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/.test/common/dependencies.bicep rename to modules/ServiceBus/namespaces/.test/common/dependencies.bicep diff --git a/modules/Microsoft.ServiceBus/namespaces/.test/common/main.test.bicep b/modules/ServiceBus/namespaces/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/.test/common/main.test.bicep rename to modules/ServiceBus/namespaces/.test/common/main.test.bicep diff --git a/modules/Microsoft.ServiceBus/namespaces/.test/encr/dependencies.bicep b/modules/ServiceBus/namespaces/.test/encr/dependencies.bicep similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/.test/encr/dependencies.bicep rename to modules/ServiceBus/namespaces/.test/encr/dependencies.bicep diff --git a/modules/Microsoft.ServiceBus/namespaces/.test/encr/main.test.bicep b/modules/ServiceBus/namespaces/.test/encr/main.test.bicep similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/.test/encr/main.test.bicep rename to modules/ServiceBus/namespaces/.test/encr/main.test.bicep diff --git a/modules/Microsoft.ServiceBus/namespaces/.test/min/main.test.bicep b/modules/ServiceBus/namespaces/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/.test/min/main.test.bicep rename to modules/ServiceBus/namespaces/.test/min/main.test.bicep diff --git a/modules/Microsoft.ServiceBus/namespaces/.test/pe/dependencies.bicep b/modules/ServiceBus/namespaces/.test/pe/dependencies.bicep similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/.test/pe/dependencies.bicep rename to modules/ServiceBus/namespaces/.test/pe/dependencies.bicep diff --git a/modules/Microsoft.ServiceBus/namespaces/.test/pe/main.test.bicep b/modules/ServiceBus/namespaces/.test/pe/main.test.bicep similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/.test/pe/main.test.bicep rename to modules/ServiceBus/namespaces/.test/pe/main.test.bicep diff --git a/modules/Microsoft.ServiceBus/namespaces/readme.md b/modules/ServiceBus/namespaces/README.md similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/readme.md rename to modules/ServiceBus/namespaces/README.md diff --git a/modules/Microsoft.ServiceBus/namespaces/authorizationRules/readme.md b/modules/ServiceBus/namespaces/authorizationRules/README.md similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/authorizationRules/readme.md rename to modules/ServiceBus/namespaces/authorizationRules/README.md diff --git a/modules/Microsoft.ServiceBus/namespaces/authorizationRules/main.bicep b/modules/ServiceBus/namespaces/authorizationRules/main.bicep similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/authorizationRules/main.bicep rename to modules/ServiceBus/namespaces/authorizationRules/main.bicep diff --git a/modules/Microsoft.ServiceBus/namespaces/authorizationRules/version.json b/modules/ServiceBus/namespaces/authorizationRules/version.json similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/authorizationRules/version.json rename to modules/ServiceBus/namespaces/authorizationRules/version.json diff --git a/modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/readme.md b/modules/ServiceBus/namespaces/disasterRecoveryConfigs/README.md similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/readme.md rename to modules/ServiceBus/namespaces/disasterRecoveryConfigs/README.md diff --git a/modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/main.bicep b/modules/ServiceBus/namespaces/disasterRecoveryConfigs/main.bicep similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/main.bicep rename to modules/ServiceBus/namespaces/disasterRecoveryConfigs/main.bicep diff --git a/modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json b/modules/ServiceBus/namespaces/disasterRecoveryConfigs/version.json similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json rename to modules/ServiceBus/namespaces/disasterRecoveryConfigs/version.json diff --git a/modules/Microsoft.ServiceBus/namespaces/main.bicep b/modules/ServiceBus/namespaces/main.bicep similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/main.bicep rename to modules/ServiceBus/namespaces/main.bicep diff --git a/modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/readme.md b/modules/ServiceBus/namespaces/migrationConfigurations/README.md similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/readme.md rename to modules/ServiceBus/namespaces/migrationConfigurations/README.md diff --git a/modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/main.bicep b/modules/ServiceBus/namespaces/migrationConfigurations/main.bicep similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/main.bicep rename to modules/ServiceBus/namespaces/migrationConfigurations/main.bicep diff --git a/modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json b/modules/ServiceBus/namespaces/migrationConfigurations/version.json similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json rename to modules/ServiceBus/namespaces/migrationConfigurations/version.json diff --git a/modules/Microsoft.ServiceBus/namespaces/networkRuleSets/readme.md b/modules/ServiceBus/namespaces/networkRuleSets/README.md similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/networkRuleSets/readme.md rename to modules/ServiceBus/namespaces/networkRuleSets/README.md diff --git a/modules/Microsoft.ServiceBus/namespaces/networkRuleSets/main.bicep b/modules/ServiceBus/namespaces/networkRuleSets/main.bicep similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/networkRuleSets/main.bicep rename to modules/ServiceBus/namespaces/networkRuleSets/main.bicep diff --git a/modules/Microsoft.ServiceBus/namespaces/networkRuleSets/version.json b/modules/ServiceBus/namespaces/networkRuleSets/version.json similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/networkRuleSets/version.json rename to modules/ServiceBus/namespaces/networkRuleSets/version.json diff --git a/modules/Microsoft.ServiceBus/namespaces/queues/.bicep/nested_roleAssignments.bicep b/modules/ServiceBus/namespaces/queues/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/queues/.bicep/nested_roleAssignments.bicep rename to modules/ServiceBus/namespaces/queues/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.ServiceBus/namespaces/queues/readme.md b/modules/ServiceBus/namespaces/queues/README.md similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/queues/readme.md rename to modules/ServiceBus/namespaces/queues/README.md diff --git a/modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/readme.md b/modules/ServiceBus/namespaces/queues/authorizationRules/README.md similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/readme.md rename to modules/ServiceBus/namespaces/queues/authorizationRules/README.md diff --git a/modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/main.bicep b/modules/ServiceBus/namespaces/queues/authorizationRules/main.bicep similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/main.bicep rename to modules/ServiceBus/namespaces/queues/authorizationRules/main.bicep diff --git a/modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json b/modules/ServiceBus/namespaces/queues/authorizationRules/version.json similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json rename to modules/ServiceBus/namespaces/queues/authorizationRules/version.json diff --git a/modules/Microsoft.ServiceBus/namespaces/queues/main.bicep b/modules/ServiceBus/namespaces/queues/main.bicep similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/queues/main.bicep rename to modules/ServiceBus/namespaces/queues/main.bicep diff --git a/modules/Microsoft.ServiceBus/namespaces/queues/version.json b/modules/ServiceBus/namespaces/queues/version.json similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/queues/version.json rename to modules/ServiceBus/namespaces/queues/version.json diff --git a/modules/Microsoft.ServiceBus/namespaces/topics/.bicep/nested_roleAssignments.bicep b/modules/ServiceBus/namespaces/topics/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/topics/.bicep/nested_roleAssignments.bicep rename to modules/ServiceBus/namespaces/topics/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.ServiceBus/namespaces/topics/readme.md b/modules/ServiceBus/namespaces/topics/README.md similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/topics/readme.md rename to modules/ServiceBus/namespaces/topics/README.md diff --git a/modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/readme.md b/modules/ServiceBus/namespaces/topics/authorizationRules/README.md similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/readme.md rename to modules/ServiceBus/namespaces/topics/authorizationRules/README.md diff --git a/modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/main.bicep b/modules/ServiceBus/namespaces/topics/authorizationRules/main.bicep similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/main.bicep rename to modules/ServiceBus/namespaces/topics/authorizationRules/main.bicep diff --git a/modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/version.json b/modules/ServiceBus/namespaces/topics/authorizationRules/version.json similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/topics/authorizationRules/version.json rename to modules/ServiceBus/namespaces/topics/authorizationRules/version.json diff --git a/modules/Microsoft.ServiceBus/namespaces/topics/main.bicep b/modules/ServiceBus/namespaces/topics/main.bicep similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/topics/main.bicep rename to modules/ServiceBus/namespaces/topics/main.bicep diff --git a/modules/Microsoft.ServiceBus/namespaces/topics/version.json b/modules/ServiceBus/namespaces/topics/version.json similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/topics/version.json rename to modules/ServiceBus/namespaces/topics/version.json diff --git a/modules/Microsoft.ServiceBus/namespaces/version.json b/modules/ServiceBus/namespaces/version.json similarity index 100% rename from modules/Microsoft.ServiceBus/namespaces/version.json rename to modules/ServiceBus/namespaces/version.json diff --git a/modules/Microsoft.ServiceFabric/clusters/.bicep/nested_roleAssignments.bicep b/modules/ServiceFabric/clusters/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.ServiceFabric/clusters/.bicep/nested_roleAssignments.bicep rename to modules/ServiceFabric/clusters/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/cert/main.test.bicep b/modules/ServiceFabric/clusters/.test/cert/main.test.bicep similarity index 100% rename from modules/Microsoft.ServiceFabric/clusters/.test/cert/main.test.bicep rename to modules/ServiceFabric/clusters/.test/cert/main.test.bicep diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/common/dependencies.bicep b/modules/ServiceFabric/clusters/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.ServiceFabric/clusters/.test/common/dependencies.bicep rename to modules/ServiceFabric/clusters/.test/common/dependencies.bicep diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/common/main.test.bicep b/modules/ServiceFabric/clusters/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.ServiceFabric/clusters/.test/common/main.test.bicep rename to modules/ServiceFabric/clusters/.test/common/main.test.bicep diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/min/main.test.bicep b/modules/ServiceFabric/clusters/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.ServiceFabric/clusters/.test/min/main.test.bicep rename to modules/ServiceFabric/clusters/.test/min/main.test.bicep diff --git a/modules/Microsoft.ServiceFabric/clusters/readme.md b/modules/ServiceFabric/clusters/README.md similarity index 100% rename from modules/Microsoft.ServiceFabric/clusters/readme.md rename to modules/ServiceFabric/clusters/README.md diff --git a/modules/Microsoft.ServiceFabric/clusters/applicationTypes/readme.md b/modules/ServiceFabric/clusters/applicationTypes/README.md similarity index 100% rename from modules/Microsoft.ServiceFabric/clusters/applicationTypes/readme.md rename to modules/ServiceFabric/clusters/applicationTypes/README.md diff --git a/modules/Microsoft.ServiceFabric/clusters/applicationTypes/main.bicep b/modules/ServiceFabric/clusters/applicationTypes/main.bicep similarity index 100% rename from modules/Microsoft.ServiceFabric/clusters/applicationTypes/main.bicep rename to modules/ServiceFabric/clusters/applicationTypes/main.bicep diff --git a/modules/Microsoft.ServiceFabric/clusters/applicationTypes/version.json b/modules/ServiceFabric/clusters/applicationTypes/version.json similarity index 100% rename from modules/Microsoft.ServiceFabric/clusters/applicationTypes/version.json rename to modules/ServiceFabric/clusters/applicationTypes/version.json diff --git a/modules/Microsoft.ServiceFabric/clusters/main.bicep b/modules/ServiceFabric/clusters/main.bicep similarity index 100% rename from modules/Microsoft.ServiceFabric/clusters/main.bicep rename to modules/ServiceFabric/clusters/main.bicep diff --git a/modules/Microsoft.ServiceFabric/clusters/version.json b/modules/ServiceFabric/clusters/version.json similarity index 100% rename from modules/Microsoft.ServiceFabric/clusters/version.json rename to modules/ServiceFabric/clusters/version.json diff --git a/modules/Microsoft.SignalRService/signalR/.bicep/nested_roleAssignments.bicep b/modules/SignalRService/signalR/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.SignalRService/signalR/.bicep/nested_roleAssignments.bicep rename to modules/SignalRService/signalR/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.SignalRService/signalR/.test/common/dependencies.bicep b/modules/SignalRService/signalR/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.SignalRService/signalR/.test/common/dependencies.bicep rename to modules/SignalRService/signalR/.test/common/dependencies.bicep diff --git a/modules/Microsoft.SignalRService/signalR/.test/common/main.test.bicep b/modules/SignalRService/signalR/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.SignalRService/signalR/.test/common/main.test.bicep rename to modules/SignalRService/signalR/.test/common/main.test.bicep diff --git a/modules/Microsoft.SignalRService/signalR/.test/min/main.test.bicep b/modules/SignalRService/signalR/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.SignalRService/signalR/.test/min/main.test.bicep rename to modules/SignalRService/signalR/.test/min/main.test.bicep diff --git a/modules/Microsoft.SignalRService/signalR/readme.md b/modules/SignalRService/signalR/README.md similarity index 100% rename from modules/Microsoft.SignalRService/signalR/readme.md rename to modules/SignalRService/signalR/README.md diff --git a/modules/Microsoft.SignalRService/signalR/main.bicep b/modules/SignalRService/signalR/main.bicep similarity index 100% rename from modules/Microsoft.SignalRService/signalR/main.bicep rename to modules/SignalRService/signalR/main.bicep diff --git a/modules/Microsoft.SignalRService/signalR/version.json b/modules/SignalRService/signalR/version.json similarity index 100% rename from modules/Microsoft.SignalRService/signalR/version.json rename to modules/SignalRService/signalR/version.json diff --git a/modules/Microsoft.SignalRService/webPubSub/.bicep/nested_roleAssignments.bicep b/modules/SignalRService/webPubSub/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.SignalRService/webPubSub/.bicep/nested_roleAssignments.bicep rename to modules/SignalRService/webPubSub/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.SignalRService/webPubSub/.test/common/dependencies.bicep b/modules/SignalRService/webPubSub/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.SignalRService/webPubSub/.test/common/dependencies.bicep rename to modules/SignalRService/webPubSub/.test/common/dependencies.bicep diff --git a/modules/Microsoft.SignalRService/webPubSub/.test/common/main.test.bicep b/modules/SignalRService/webPubSub/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.SignalRService/webPubSub/.test/common/main.test.bicep rename to modules/SignalRService/webPubSub/.test/common/main.test.bicep diff --git a/modules/Microsoft.SignalRService/webPubSub/.test/min/main.test.bicep b/modules/SignalRService/webPubSub/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.SignalRService/webPubSub/.test/min/main.test.bicep rename to modules/SignalRService/webPubSub/.test/min/main.test.bicep diff --git a/modules/Microsoft.SignalRService/webPubSub/.test/pe/dependencies.bicep b/modules/SignalRService/webPubSub/.test/pe/dependencies.bicep similarity index 100% rename from modules/Microsoft.SignalRService/webPubSub/.test/pe/dependencies.bicep rename to modules/SignalRService/webPubSub/.test/pe/dependencies.bicep diff --git a/modules/Microsoft.SignalRService/webPubSub/.test/pe/main.test.bicep b/modules/SignalRService/webPubSub/.test/pe/main.test.bicep similarity index 100% rename from modules/Microsoft.SignalRService/webPubSub/.test/pe/main.test.bicep rename to modules/SignalRService/webPubSub/.test/pe/main.test.bicep diff --git a/modules/Microsoft.SignalRService/webPubSub/readme.md b/modules/SignalRService/webPubSub/README.md similarity index 100% rename from modules/Microsoft.SignalRService/webPubSub/readme.md rename to modules/SignalRService/webPubSub/README.md diff --git a/modules/Microsoft.SignalRService/webPubSub/main.bicep b/modules/SignalRService/webPubSub/main.bicep similarity index 100% rename from modules/Microsoft.SignalRService/webPubSub/main.bicep rename to modules/SignalRService/webPubSub/main.bicep diff --git a/modules/Microsoft.SignalRService/webPubSub/version.json b/modules/SignalRService/webPubSub/version.json similarity index 100% rename from modules/Microsoft.SignalRService/webPubSub/version.json rename to modules/SignalRService/webPubSub/version.json diff --git a/modules/Microsoft.Sql/managedInstances/.bicep/nested_roleAssignments.bicep b/modules/Sql/managedInstances/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Sql/managedInstances/.bicep/nested_roleAssignments.bicep rename to modules/Sql/managedInstances/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Sql/managedInstances/.test/common/dependencies.bicep b/modules/Sql/managedInstances/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Sql/managedInstances/.test/common/dependencies.bicep rename to modules/Sql/managedInstances/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Sql/managedInstances/.test/common/main.test.bicep b/modules/Sql/managedInstances/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Sql/managedInstances/.test/common/main.test.bicep rename to modules/Sql/managedInstances/.test/common/main.test.bicep diff --git a/modules/Microsoft.Sql/managedInstances/.test/min/dependencies.bicep b/modules/Sql/managedInstances/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.Sql/managedInstances/.test/min/dependencies.bicep rename to modules/Sql/managedInstances/.test/min/dependencies.bicep diff --git a/modules/Microsoft.Sql/managedInstances/.test/min/main.test.bicep b/modules/Sql/managedInstances/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Sql/managedInstances/.test/min/main.test.bicep rename to modules/Sql/managedInstances/.test/min/main.test.bicep diff --git a/modules/Microsoft.Sql/managedInstances/readme.md b/modules/Sql/managedInstances/README.md similarity index 100% rename from modules/Microsoft.Sql/managedInstances/readme.md rename to modules/Sql/managedInstances/README.md diff --git a/modules/Microsoft.Sql/managedInstances/administrators/readme.md b/modules/Sql/managedInstances/administrators/README.md similarity index 100% rename from modules/Microsoft.Sql/managedInstances/administrators/readme.md rename to modules/Sql/managedInstances/administrators/README.md diff --git a/modules/Microsoft.Sql/managedInstances/administrators/main.bicep b/modules/Sql/managedInstances/administrators/main.bicep similarity index 100% rename from modules/Microsoft.Sql/managedInstances/administrators/main.bicep rename to modules/Sql/managedInstances/administrators/main.bicep diff --git a/modules/Microsoft.Sql/managedInstances/administrators/version.json b/modules/Sql/managedInstances/administrators/version.json similarity index 100% rename from modules/Microsoft.Sql/managedInstances/administrators/version.json rename to modules/Sql/managedInstances/administrators/version.json diff --git a/modules/Microsoft.Sql/managedInstances/databases/readme.md b/modules/Sql/managedInstances/databases/README.md similarity index 100% rename from modules/Microsoft.Sql/managedInstances/databases/readme.md rename to modules/Sql/managedInstances/databases/README.md diff --git a/modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/readme.md b/modules/Sql/managedInstances/databases/backupLongTermRetentionPolicies/README.md similarity index 100% rename from modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/readme.md rename to modules/Sql/managedInstances/databases/backupLongTermRetentionPolicies/README.md diff --git a/modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/main.bicep b/modules/Sql/managedInstances/databases/backupLongTermRetentionPolicies/main.bicep similarity index 100% rename from modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/main.bicep rename to modules/Sql/managedInstances/databases/backupLongTermRetentionPolicies/main.bicep diff --git a/modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json b/modules/Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json similarity index 100% rename from modules/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json rename to modules/Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json diff --git a/modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/readme.md b/modules/Sql/managedInstances/databases/backupShortTermRetentionPolicies/README.md similarity index 100% rename from modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/readme.md rename to modules/Sql/managedInstances/databases/backupShortTermRetentionPolicies/README.md diff --git a/modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/main.bicep b/modules/Sql/managedInstances/databases/backupShortTermRetentionPolicies/main.bicep similarity index 100% rename from modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/main.bicep rename to modules/Sql/managedInstances/databases/backupShortTermRetentionPolicies/main.bicep diff --git a/modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json b/modules/Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json similarity index 100% rename from modules/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json rename to modules/Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json diff --git a/modules/Microsoft.Sql/managedInstances/databases/main.bicep b/modules/Sql/managedInstances/databases/main.bicep similarity index 100% rename from modules/Microsoft.Sql/managedInstances/databases/main.bicep rename to modules/Sql/managedInstances/databases/main.bicep diff --git a/modules/Microsoft.Sql/managedInstances/databases/version.json b/modules/Sql/managedInstances/databases/version.json similarity index 100% rename from modules/Microsoft.Sql/managedInstances/databases/version.json rename to modules/Sql/managedInstances/databases/version.json diff --git a/modules/Microsoft.Sql/managedInstances/encryptionProtector/readme.md b/modules/Sql/managedInstances/encryptionProtector/README.md similarity index 100% rename from modules/Microsoft.Sql/managedInstances/encryptionProtector/readme.md rename to modules/Sql/managedInstances/encryptionProtector/README.md diff --git a/modules/Microsoft.Sql/managedInstances/encryptionProtector/main.bicep b/modules/Sql/managedInstances/encryptionProtector/main.bicep similarity index 100% rename from modules/Microsoft.Sql/managedInstances/encryptionProtector/main.bicep rename to modules/Sql/managedInstances/encryptionProtector/main.bicep diff --git a/modules/Microsoft.Sql/managedInstances/encryptionProtector/version.json b/modules/Sql/managedInstances/encryptionProtector/version.json similarity index 100% rename from modules/Microsoft.Sql/managedInstances/encryptionProtector/version.json rename to modules/Sql/managedInstances/encryptionProtector/version.json diff --git a/modules/Microsoft.Sql/managedInstances/keys/readme.md b/modules/Sql/managedInstances/keys/README.md similarity index 100% rename from modules/Microsoft.Sql/managedInstances/keys/readme.md rename to modules/Sql/managedInstances/keys/README.md diff --git a/modules/Microsoft.Sql/managedInstances/keys/main.bicep b/modules/Sql/managedInstances/keys/main.bicep similarity index 100% rename from modules/Microsoft.Sql/managedInstances/keys/main.bicep rename to modules/Sql/managedInstances/keys/main.bicep diff --git a/modules/Microsoft.Sql/managedInstances/keys/version.json b/modules/Sql/managedInstances/keys/version.json similarity index 100% rename from modules/Microsoft.Sql/managedInstances/keys/version.json rename to modules/Sql/managedInstances/keys/version.json diff --git a/modules/Microsoft.Sql/managedInstances/main.bicep b/modules/Sql/managedInstances/main.bicep similarity index 100% rename from modules/Microsoft.Sql/managedInstances/main.bicep rename to modules/Sql/managedInstances/main.bicep diff --git a/modules/Microsoft.Sql/managedInstances/securityAlertPolicies/readme.md b/modules/Sql/managedInstances/securityAlertPolicies/README.md similarity index 100% rename from modules/Microsoft.Sql/managedInstances/securityAlertPolicies/readme.md rename to modules/Sql/managedInstances/securityAlertPolicies/README.md diff --git a/modules/Microsoft.Sql/managedInstances/securityAlertPolicies/main.bicep b/modules/Sql/managedInstances/securityAlertPolicies/main.bicep similarity index 100% rename from modules/Microsoft.Sql/managedInstances/securityAlertPolicies/main.bicep rename to modules/Sql/managedInstances/securityAlertPolicies/main.bicep diff --git a/modules/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json b/modules/Sql/managedInstances/securityAlertPolicies/version.json similarity index 100% rename from modules/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json rename to modules/Sql/managedInstances/securityAlertPolicies/version.json diff --git a/modules/Microsoft.Sql/managedInstances/version.json b/modules/Sql/managedInstances/version.json similarity index 100% rename from modules/Microsoft.Sql/managedInstances/version.json rename to modules/Sql/managedInstances/version.json diff --git a/modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/readme.md b/modules/Sql/managedInstances/vulnerabilityAssessments/README.md similarity index 100% rename from modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/readme.md rename to modules/Sql/managedInstances/vulnerabilityAssessments/README.md diff --git a/modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/main.bicep b/modules/Sql/managedInstances/vulnerabilityAssessments/main.bicep similarity index 100% rename from modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/main.bicep rename to modules/Sql/managedInstances/vulnerabilityAssessments/main.bicep diff --git a/modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json b/modules/Sql/managedInstances/vulnerabilityAssessments/version.json similarity index 100% rename from modules/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json rename to modules/Sql/managedInstances/vulnerabilityAssessments/version.json diff --git a/modules/Microsoft.Sql/servers/.bicep/nested_roleAssignments.bicep b/modules/Sql/servers/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Sql/servers/.bicep/nested_roleAssignments.bicep rename to modules/Sql/servers/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Sql/servers/.test/admin/dependencies.bicep b/modules/Sql/servers/.test/admin/dependencies.bicep similarity index 100% rename from modules/Microsoft.Sql/servers/.test/admin/dependencies.bicep rename to modules/Sql/servers/.test/admin/dependencies.bicep diff --git a/modules/Microsoft.Sql/servers/.test/admin/main.test.bicep b/modules/Sql/servers/.test/admin/main.test.bicep similarity index 100% rename from modules/Microsoft.Sql/servers/.test/admin/main.test.bicep rename to modules/Sql/servers/.test/admin/main.test.bicep diff --git a/modules/Microsoft.Sql/servers/.test/common/dependencies.bicep b/modules/Sql/servers/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Sql/servers/.test/common/dependencies.bicep rename to modules/Sql/servers/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Sql/servers/.test/common/main.test.bicep b/modules/Sql/servers/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Sql/servers/.test/common/main.test.bicep rename to modules/Sql/servers/.test/common/main.test.bicep diff --git a/modules/Microsoft.Sql/servers/.test/pe/dependencies.bicep b/modules/Sql/servers/.test/pe/dependencies.bicep similarity index 100% rename from modules/Microsoft.Sql/servers/.test/pe/dependencies.bicep rename to modules/Sql/servers/.test/pe/dependencies.bicep diff --git a/modules/Microsoft.Sql/servers/.test/pe/main.test.bicep b/modules/Sql/servers/.test/pe/main.test.bicep similarity index 100% rename from modules/Microsoft.Sql/servers/.test/pe/main.test.bicep rename to modules/Sql/servers/.test/pe/main.test.bicep diff --git a/modules/Microsoft.Sql/servers/.test/secondary/dependencies.bicep b/modules/Sql/servers/.test/secondary/dependencies.bicep similarity index 100% rename from modules/Microsoft.Sql/servers/.test/secondary/dependencies.bicep rename to modules/Sql/servers/.test/secondary/dependencies.bicep diff --git a/modules/Microsoft.Sql/servers/.test/secondary/main.test.bicep b/modules/Sql/servers/.test/secondary/main.test.bicep similarity index 100% rename from modules/Microsoft.Sql/servers/.test/secondary/main.test.bicep rename to modules/Sql/servers/.test/secondary/main.test.bicep diff --git a/modules/Microsoft.Sql/servers/readme.md b/modules/Sql/servers/README.md similarity index 100% rename from modules/Microsoft.Sql/servers/readme.md rename to modules/Sql/servers/README.md diff --git a/modules/Microsoft.Sql/servers/databases/readme.md b/modules/Sql/servers/databases/README.md similarity index 100% rename from modules/Microsoft.Sql/servers/databases/readme.md rename to modules/Sql/servers/databases/README.md diff --git a/modules/Microsoft.Sql/servers/databases/backupLongTermRetentionPolicies/readme.md b/modules/Sql/servers/databases/backupLongTermRetentionPolicies/README.md similarity index 100% rename from modules/Microsoft.Sql/servers/databases/backupLongTermRetentionPolicies/readme.md rename to modules/Sql/servers/databases/backupLongTermRetentionPolicies/README.md diff --git a/modules/Microsoft.Sql/servers/databases/backupLongTermRetentionPolicies/main.bicep b/modules/Sql/servers/databases/backupLongTermRetentionPolicies/main.bicep similarity index 100% rename from modules/Microsoft.Sql/servers/databases/backupLongTermRetentionPolicies/main.bicep rename to modules/Sql/servers/databases/backupLongTermRetentionPolicies/main.bicep diff --git a/modules/Microsoft.Sql/servers/databases/backupLongTermRetentionPolicies/version.json b/modules/Sql/servers/databases/backupLongTermRetentionPolicies/version.json similarity index 100% rename from modules/Microsoft.Sql/servers/databases/backupLongTermRetentionPolicies/version.json rename to modules/Sql/servers/databases/backupLongTermRetentionPolicies/version.json diff --git a/modules/Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies/readme.md b/modules/Sql/servers/databases/backupShortTermRetentionPolicies/README.md similarity index 100% rename from modules/Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies/readme.md rename to modules/Sql/servers/databases/backupShortTermRetentionPolicies/README.md diff --git a/modules/Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies/main.bicep b/modules/Sql/servers/databases/backupShortTermRetentionPolicies/main.bicep similarity index 100% rename from modules/Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies/main.bicep rename to modules/Sql/servers/databases/backupShortTermRetentionPolicies/main.bicep diff --git a/modules/Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies/version.json b/modules/Sql/servers/databases/backupShortTermRetentionPolicies/version.json similarity index 100% rename from modules/Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies/version.json rename to modules/Sql/servers/databases/backupShortTermRetentionPolicies/version.json diff --git a/modules/Microsoft.Sql/servers/databases/main.bicep b/modules/Sql/servers/databases/main.bicep similarity index 100% rename from modules/Microsoft.Sql/servers/databases/main.bicep rename to modules/Sql/servers/databases/main.bicep diff --git a/modules/Microsoft.Sql/servers/databases/version.json b/modules/Sql/servers/databases/version.json similarity index 100% rename from modules/Microsoft.Sql/servers/databases/version.json rename to modules/Sql/servers/databases/version.json diff --git a/modules/Microsoft.Sql/servers/elasticPools/readme.md b/modules/Sql/servers/elasticPools/README.md similarity index 100% rename from modules/Microsoft.Sql/servers/elasticPools/readme.md rename to modules/Sql/servers/elasticPools/README.md diff --git a/modules/Microsoft.Sql/servers/elasticPools/main.bicep b/modules/Sql/servers/elasticPools/main.bicep similarity index 100% rename from modules/Microsoft.Sql/servers/elasticPools/main.bicep rename to modules/Sql/servers/elasticPools/main.bicep diff --git a/modules/Microsoft.Sql/servers/elasticPools/version.json b/modules/Sql/servers/elasticPools/version.json similarity index 100% rename from modules/Microsoft.Sql/servers/elasticPools/version.json rename to modules/Sql/servers/elasticPools/version.json diff --git a/modules/Microsoft.Sql/servers/encryptionProtector/readme.md b/modules/Sql/servers/encryptionProtector/README.md similarity index 100% rename from modules/Microsoft.Sql/servers/encryptionProtector/readme.md rename to modules/Sql/servers/encryptionProtector/README.md diff --git a/modules/Microsoft.Sql/servers/encryptionProtector/main.bicep b/modules/Sql/servers/encryptionProtector/main.bicep similarity index 100% rename from modules/Microsoft.Sql/servers/encryptionProtector/main.bicep rename to modules/Sql/servers/encryptionProtector/main.bicep diff --git a/modules/Microsoft.Sql/servers/encryptionProtector/version.json b/modules/Sql/servers/encryptionProtector/version.json similarity index 100% rename from modules/Microsoft.Sql/servers/encryptionProtector/version.json rename to modules/Sql/servers/encryptionProtector/version.json diff --git a/modules/Microsoft.Sql/servers/firewallRules/readme.md b/modules/Sql/servers/firewallRules/README.md similarity index 100% rename from modules/Microsoft.Sql/servers/firewallRules/readme.md rename to modules/Sql/servers/firewallRules/README.md diff --git a/modules/Microsoft.Sql/servers/firewallRules/main.bicep b/modules/Sql/servers/firewallRules/main.bicep similarity index 100% rename from modules/Microsoft.Sql/servers/firewallRules/main.bicep rename to modules/Sql/servers/firewallRules/main.bicep diff --git a/modules/Microsoft.Sql/servers/firewallRules/version.json b/modules/Sql/servers/firewallRules/version.json similarity index 100% rename from modules/Microsoft.Sql/servers/firewallRules/version.json rename to modules/Sql/servers/firewallRules/version.json diff --git a/modules/Microsoft.Sql/servers/keys/readme.md b/modules/Sql/servers/keys/README.md similarity index 100% rename from modules/Microsoft.Sql/servers/keys/readme.md rename to modules/Sql/servers/keys/README.md diff --git a/modules/Microsoft.Sql/servers/keys/main.bicep b/modules/Sql/servers/keys/main.bicep similarity index 100% rename from modules/Microsoft.Sql/servers/keys/main.bicep rename to modules/Sql/servers/keys/main.bicep diff --git a/modules/Microsoft.Sql/servers/keys/version.json b/modules/Sql/servers/keys/version.json similarity index 100% rename from modules/Microsoft.Sql/servers/keys/version.json rename to modules/Sql/servers/keys/version.json diff --git a/modules/Microsoft.Sql/servers/main.bicep b/modules/Sql/servers/main.bicep similarity index 100% rename from modules/Microsoft.Sql/servers/main.bicep rename to modules/Sql/servers/main.bicep diff --git a/modules/Microsoft.Sql/servers/securityAlertPolicies/readme.md b/modules/Sql/servers/securityAlertPolicies/README.md similarity index 100% rename from modules/Microsoft.Sql/servers/securityAlertPolicies/readme.md rename to modules/Sql/servers/securityAlertPolicies/README.md diff --git a/modules/Microsoft.Sql/servers/securityAlertPolicies/main.bicep b/modules/Sql/servers/securityAlertPolicies/main.bicep similarity index 100% rename from modules/Microsoft.Sql/servers/securityAlertPolicies/main.bicep rename to modules/Sql/servers/securityAlertPolicies/main.bicep diff --git a/modules/Microsoft.Sql/servers/securityAlertPolicies/version.json b/modules/Sql/servers/securityAlertPolicies/version.json similarity index 100% rename from modules/Microsoft.Sql/servers/securityAlertPolicies/version.json rename to modules/Sql/servers/securityAlertPolicies/version.json diff --git a/modules/Microsoft.Sql/servers/version.json b/modules/Sql/servers/version.json similarity index 100% rename from modules/Microsoft.Sql/servers/version.json rename to modules/Sql/servers/version.json diff --git a/modules/Microsoft.Sql/servers/virtualNetworkRules/readme.md b/modules/Sql/servers/virtualNetworkRules/README.md similarity index 100% rename from modules/Microsoft.Sql/servers/virtualNetworkRules/readme.md rename to modules/Sql/servers/virtualNetworkRules/README.md diff --git a/modules/Microsoft.Sql/servers/virtualNetworkRules/main.bicep b/modules/Sql/servers/virtualNetworkRules/main.bicep similarity index 100% rename from modules/Microsoft.Sql/servers/virtualNetworkRules/main.bicep rename to modules/Sql/servers/virtualNetworkRules/main.bicep diff --git a/modules/Microsoft.Sql/servers/virtualNetworkRules/version.json b/modules/Sql/servers/virtualNetworkRules/version.json similarity index 100% rename from modules/Microsoft.Sql/servers/virtualNetworkRules/version.json rename to modules/Sql/servers/virtualNetworkRules/version.json diff --git a/modules/Microsoft.Sql/servers/vulnerabilityAssessments/readme.md b/modules/Sql/servers/vulnerabilityAssessments/README.md similarity index 100% rename from modules/Microsoft.Sql/servers/vulnerabilityAssessments/readme.md rename to modules/Sql/servers/vulnerabilityAssessments/README.md diff --git a/modules/Microsoft.Sql/servers/vulnerabilityAssessments/main.bicep b/modules/Sql/servers/vulnerabilityAssessments/main.bicep similarity index 100% rename from modules/Microsoft.Sql/servers/vulnerabilityAssessments/main.bicep rename to modules/Sql/servers/vulnerabilityAssessments/main.bicep diff --git a/modules/Microsoft.Sql/servers/vulnerabilityAssessments/version.json b/modules/Sql/servers/vulnerabilityAssessments/version.json similarity index 100% rename from modules/Microsoft.Sql/servers/vulnerabilityAssessments/version.json rename to modules/Sql/servers/vulnerabilityAssessments/version.json diff --git a/modules/Microsoft.Synapse/privateLinkHubs/.bicep/nested_roleAssignments.bicep b/modules/Synapse/privateLinkHubs/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Synapse/privateLinkHubs/.bicep/nested_roleAssignments.bicep rename to modules/Synapse/privateLinkHubs/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Synapse/privateLinkHubs/.test/common/dependencies.bicep b/modules/Synapse/privateLinkHubs/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Synapse/privateLinkHubs/.test/common/dependencies.bicep rename to modules/Synapse/privateLinkHubs/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Synapse/privateLinkHubs/.test/common/main.test.bicep b/modules/Synapse/privateLinkHubs/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Synapse/privateLinkHubs/.test/common/main.test.bicep rename to modules/Synapse/privateLinkHubs/.test/common/main.test.bicep diff --git a/modules/Microsoft.Synapse/privateLinkHubs/.test/min/main.test.bicep b/modules/Synapse/privateLinkHubs/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Synapse/privateLinkHubs/.test/min/main.test.bicep rename to modules/Synapse/privateLinkHubs/.test/min/main.test.bicep diff --git a/modules/Microsoft.Synapse/privateLinkHubs/readme.md b/modules/Synapse/privateLinkHubs/README.md similarity index 100% rename from modules/Microsoft.Synapse/privateLinkHubs/readme.md rename to modules/Synapse/privateLinkHubs/README.md diff --git a/modules/Microsoft.Synapse/privateLinkHubs/main.bicep b/modules/Synapse/privateLinkHubs/main.bicep similarity index 100% rename from modules/Microsoft.Synapse/privateLinkHubs/main.bicep rename to modules/Synapse/privateLinkHubs/main.bicep diff --git a/modules/Microsoft.Synapse/privateLinkHubs/version.json b/modules/Synapse/privateLinkHubs/version.json similarity index 100% rename from modules/Microsoft.Synapse/privateLinkHubs/version.json rename to modules/Synapse/privateLinkHubs/version.json diff --git a/modules/Microsoft.Synapse/workspaces/.bicep/nested_cmkRbac.bicep b/modules/Synapse/workspaces/.bicep/nested_cmkRbac.bicep similarity index 100% rename from modules/Microsoft.Synapse/workspaces/.bicep/nested_cmkRbac.bicep rename to modules/Synapse/workspaces/.bicep/nested_cmkRbac.bicep diff --git a/modules/Microsoft.Synapse/workspaces/.bicep/nested_roleAssignments.bicep b/modules/Synapse/workspaces/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Synapse/workspaces/.bicep/nested_roleAssignments.bicep rename to modules/Synapse/workspaces/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Synapse/workspaces/.test/common/dependencies.bicep b/modules/Synapse/workspaces/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Synapse/workspaces/.test/common/dependencies.bicep rename to modules/Synapse/workspaces/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Synapse/workspaces/.test/common/main.test.bicep b/modules/Synapse/workspaces/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Synapse/workspaces/.test/common/main.test.bicep rename to modules/Synapse/workspaces/.test/common/main.test.bicep diff --git a/modules/Microsoft.Synapse/workspaces/.test/encrwsai/dependencies.bicep b/modules/Synapse/workspaces/.test/encrwsai/dependencies.bicep similarity index 100% rename from modules/Microsoft.Synapse/workspaces/.test/encrwsai/dependencies.bicep rename to modules/Synapse/workspaces/.test/encrwsai/dependencies.bicep diff --git a/modules/Microsoft.Synapse/workspaces/.test/encrwsai/main.test.bicep b/modules/Synapse/workspaces/.test/encrwsai/main.test.bicep similarity index 100% rename from modules/Microsoft.Synapse/workspaces/.test/encrwsai/main.test.bicep rename to modules/Synapse/workspaces/.test/encrwsai/main.test.bicep diff --git a/modules/Microsoft.Synapse/workspaces/.test/encrwuai/dependencies.bicep b/modules/Synapse/workspaces/.test/encrwuai/dependencies.bicep similarity index 100% rename from modules/Microsoft.Synapse/workspaces/.test/encrwuai/dependencies.bicep rename to modules/Synapse/workspaces/.test/encrwuai/dependencies.bicep diff --git a/modules/Microsoft.Synapse/workspaces/.test/encrwuai/main.test.bicep b/modules/Synapse/workspaces/.test/encrwuai/main.test.bicep similarity index 100% rename from modules/Microsoft.Synapse/workspaces/.test/encrwuai/main.test.bicep rename to modules/Synapse/workspaces/.test/encrwuai/main.test.bicep diff --git a/modules/Microsoft.Synapse/workspaces/.test/managedvnet/dependencies.bicep b/modules/Synapse/workspaces/.test/managedvnet/dependencies.bicep similarity index 100% rename from modules/Microsoft.Synapse/workspaces/.test/managedvnet/dependencies.bicep rename to modules/Synapse/workspaces/.test/managedvnet/dependencies.bicep diff --git a/modules/Microsoft.Synapse/workspaces/.test/managedvnet/main.test.bicep b/modules/Synapse/workspaces/.test/managedvnet/main.test.bicep similarity index 100% rename from modules/Microsoft.Synapse/workspaces/.test/managedvnet/main.test.bicep rename to modules/Synapse/workspaces/.test/managedvnet/main.test.bicep diff --git a/modules/Microsoft.Synapse/workspaces/.test/min/dependencies.bicep b/modules/Synapse/workspaces/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.Synapse/workspaces/.test/min/dependencies.bicep rename to modules/Synapse/workspaces/.test/min/dependencies.bicep diff --git a/modules/Microsoft.Synapse/workspaces/.test/min/main.test.bicep b/modules/Synapse/workspaces/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Synapse/workspaces/.test/min/main.test.bicep rename to modules/Synapse/workspaces/.test/min/main.test.bicep diff --git a/modules/Microsoft.Synapse/workspaces/readme.md b/modules/Synapse/workspaces/README.md similarity index 100% rename from modules/Microsoft.Synapse/workspaces/readme.md rename to modules/Synapse/workspaces/README.md diff --git a/modules/Microsoft.Synapse/workspaces/keys/readme.md b/modules/Synapse/workspaces/keys/README.md similarity index 100% rename from modules/Microsoft.Synapse/workspaces/keys/readme.md rename to modules/Synapse/workspaces/keys/README.md diff --git a/modules/Microsoft.Synapse/workspaces/keys/main.bicep b/modules/Synapse/workspaces/keys/main.bicep similarity index 100% rename from modules/Microsoft.Synapse/workspaces/keys/main.bicep rename to modules/Synapse/workspaces/keys/main.bicep diff --git a/modules/Microsoft.Synapse/workspaces/keys/version.json b/modules/Synapse/workspaces/keys/version.json similarity index 100% rename from modules/Microsoft.Synapse/workspaces/keys/version.json rename to modules/Synapse/workspaces/keys/version.json diff --git a/modules/Microsoft.Synapse/workspaces/main.bicep b/modules/Synapse/workspaces/main.bicep similarity index 100% rename from modules/Microsoft.Synapse/workspaces/main.bicep rename to modules/Synapse/workspaces/main.bicep diff --git a/modules/Microsoft.Synapse/workspaces/version.json b/modules/Synapse/workspaces/version.json similarity index 100% rename from modules/Microsoft.Synapse/workspaces/version.json rename to modules/Synapse/workspaces/version.json diff --git a/modules/Microsoft.VirtualMachineImages/imageTemplates/.bicep/nested_roleAssignments.bicep b/modules/VirtualMachineImages/imageTemplates/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.VirtualMachineImages/imageTemplates/.bicep/nested_roleAssignments.bicep rename to modules/VirtualMachineImages/imageTemplates/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.VirtualMachineImages/imageTemplates/.test/common/dependencies.bicep b/modules/VirtualMachineImages/imageTemplates/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.VirtualMachineImages/imageTemplates/.test/common/dependencies.bicep rename to modules/VirtualMachineImages/imageTemplates/.test/common/dependencies.bicep diff --git a/modules/Microsoft.VirtualMachineImages/imageTemplates/.test/common/main.test.bicep b/modules/VirtualMachineImages/imageTemplates/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.VirtualMachineImages/imageTemplates/.test/common/main.test.bicep rename to modules/VirtualMachineImages/imageTemplates/.test/common/main.test.bicep diff --git a/modules/Microsoft.VirtualMachineImages/imageTemplates/.test/min/dependencies.bicep b/modules/VirtualMachineImages/imageTemplates/.test/min/dependencies.bicep similarity index 100% rename from modules/Microsoft.VirtualMachineImages/imageTemplates/.test/min/dependencies.bicep rename to modules/VirtualMachineImages/imageTemplates/.test/min/dependencies.bicep diff --git a/modules/Microsoft.VirtualMachineImages/imageTemplates/.test/min/main.test.bicep b/modules/VirtualMachineImages/imageTemplates/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.VirtualMachineImages/imageTemplates/.test/min/main.test.bicep rename to modules/VirtualMachineImages/imageTemplates/.test/min/main.test.bicep diff --git a/modules/Microsoft.VirtualMachineImages/imageTemplates/readme.md b/modules/VirtualMachineImages/imageTemplates/README.md similarity index 100% rename from modules/Microsoft.VirtualMachineImages/imageTemplates/readme.md rename to modules/VirtualMachineImages/imageTemplates/README.md diff --git a/modules/Microsoft.VirtualMachineImages/imageTemplates/main.bicep b/modules/VirtualMachineImages/imageTemplates/main.bicep similarity index 100% rename from modules/Microsoft.VirtualMachineImages/imageTemplates/main.bicep rename to modules/VirtualMachineImages/imageTemplates/main.bicep diff --git a/modules/Microsoft.VirtualMachineImages/imageTemplates/version.json b/modules/VirtualMachineImages/imageTemplates/version.json similarity index 100% rename from modules/Microsoft.VirtualMachineImages/imageTemplates/version.json rename to modules/VirtualMachineImages/imageTemplates/version.json diff --git a/modules/Microsoft.Web/connections/.bicep/nested_roleAssignments.bicep b/modules/Web/connections/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Web/connections/.bicep/nested_roleAssignments.bicep rename to modules/Web/connections/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Web/connections/.test/common/dependencies.bicep b/modules/Web/connections/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Web/connections/.test/common/dependencies.bicep rename to modules/Web/connections/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Web/connections/.test/common/main.test.bicep b/modules/Web/connections/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Web/connections/.test/common/main.test.bicep rename to modules/Web/connections/.test/common/main.test.bicep diff --git a/modules/Microsoft.Web/connections/readme.md b/modules/Web/connections/README.md similarity index 100% rename from modules/Microsoft.Web/connections/readme.md rename to modules/Web/connections/README.md diff --git a/modules/Microsoft.Web/connections/main.bicep b/modules/Web/connections/main.bicep similarity index 100% rename from modules/Microsoft.Web/connections/main.bicep rename to modules/Web/connections/main.bicep diff --git a/modules/Microsoft.Web/connections/version.json b/modules/Web/connections/version.json similarity index 100% rename from modules/Microsoft.Web/connections/version.json rename to modules/Web/connections/version.json diff --git a/modules/Microsoft.Web/hostingEnvironments/.bicep/nested_roleAssignments.bicep b/modules/Web/hostingEnvironments/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Web/hostingEnvironments/.bicep/nested_roleAssignments.bicep rename to modules/Web/hostingEnvironments/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Web/hostingEnvironments/.test/asev2/dependencies.bicep b/modules/Web/hostingEnvironments/.test/asev2/dependencies.bicep similarity index 100% rename from modules/Microsoft.Web/hostingEnvironments/.test/asev2/dependencies.bicep rename to modules/Web/hostingEnvironments/.test/asev2/dependencies.bicep diff --git a/modules/Microsoft.Web/hostingEnvironments/.test/asev2/main.test.bicep b/modules/Web/hostingEnvironments/.test/asev2/main.test.bicep similarity index 100% rename from modules/Microsoft.Web/hostingEnvironments/.test/asev2/main.test.bicep rename to modules/Web/hostingEnvironments/.test/asev2/main.test.bicep diff --git a/modules/Microsoft.Web/hostingEnvironments/.test/asev3/dependencies.bicep b/modules/Web/hostingEnvironments/.test/asev3/dependencies.bicep similarity index 100% rename from modules/Microsoft.Web/hostingEnvironments/.test/asev3/dependencies.bicep rename to modules/Web/hostingEnvironments/.test/asev3/dependencies.bicep diff --git a/modules/Microsoft.Web/hostingEnvironments/.test/asev3/main.test.bicep b/modules/Web/hostingEnvironments/.test/asev3/main.test.bicep similarity index 100% rename from modules/Microsoft.Web/hostingEnvironments/.test/asev3/main.test.bicep rename to modules/Web/hostingEnvironments/.test/asev3/main.test.bicep diff --git a/modules/Microsoft.Web/hostingEnvironments/readme.md b/modules/Web/hostingEnvironments/README.md similarity index 100% rename from modules/Microsoft.Web/hostingEnvironments/readme.md rename to modules/Web/hostingEnvironments/README.md diff --git a/modules/Microsoft.Web/hostingEnvironments/configurations-customdnssuffix/readme.md b/modules/Web/hostingEnvironments/configurations-customdnssuffix/README.md similarity index 100% rename from modules/Microsoft.Web/hostingEnvironments/configurations-customdnssuffix/readme.md rename to modules/Web/hostingEnvironments/configurations-customdnssuffix/README.md diff --git a/modules/Microsoft.Web/hostingEnvironments/configurations-customdnssuffix/main.bicep b/modules/Web/hostingEnvironments/configurations-customdnssuffix/main.bicep similarity index 100% rename from modules/Microsoft.Web/hostingEnvironments/configurations-customdnssuffix/main.bicep rename to modules/Web/hostingEnvironments/configurations-customdnssuffix/main.bicep diff --git a/modules/Microsoft.Web/hostingEnvironments/configurations-customdnssuffix/version.json b/modules/Web/hostingEnvironments/configurations-customdnssuffix/version.json similarity index 100% rename from modules/Microsoft.Web/hostingEnvironments/configurations-customdnssuffix/version.json rename to modules/Web/hostingEnvironments/configurations-customdnssuffix/version.json diff --git a/modules/Microsoft.Web/hostingEnvironments/configurations-networking/readme.md b/modules/Web/hostingEnvironments/configurations-networking/README.md similarity index 100% rename from modules/Microsoft.Web/hostingEnvironments/configurations-networking/readme.md rename to modules/Web/hostingEnvironments/configurations-networking/README.md diff --git a/modules/Microsoft.Web/hostingEnvironments/configurations-networking/main.bicep b/modules/Web/hostingEnvironments/configurations-networking/main.bicep similarity index 100% rename from modules/Microsoft.Web/hostingEnvironments/configurations-networking/main.bicep rename to modules/Web/hostingEnvironments/configurations-networking/main.bicep diff --git a/modules/Microsoft.Web/hostingEnvironments/configurations-networking/version.json b/modules/Web/hostingEnvironments/configurations-networking/version.json similarity index 100% rename from modules/Microsoft.Web/hostingEnvironments/configurations-networking/version.json rename to modules/Web/hostingEnvironments/configurations-networking/version.json diff --git a/modules/Microsoft.Web/hostingEnvironments/main.bicep b/modules/Web/hostingEnvironments/main.bicep similarity index 100% rename from modules/Microsoft.Web/hostingEnvironments/main.bicep rename to modules/Web/hostingEnvironments/main.bicep diff --git a/modules/Microsoft.Web/hostingEnvironments/version.json b/modules/Web/hostingEnvironments/version.json similarity index 100% rename from modules/Microsoft.Web/hostingEnvironments/version.json rename to modules/Web/hostingEnvironments/version.json diff --git a/modules/Microsoft.Web/serverfarms/.bicep/nested_roleAssignments.bicep b/modules/Web/serverfarms/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Web/serverfarms/.bicep/nested_roleAssignments.bicep rename to modules/Web/serverfarms/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Web/serverfarms/.test/common/dependencies.bicep b/modules/Web/serverfarms/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Web/serverfarms/.test/common/dependencies.bicep rename to modules/Web/serverfarms/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Web/serverfarms/.test/common/main.test.bicep b/modules/Web/serverfarms/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Web/serverfarms/.test/common/main.test.bicep rename to modules/Web/serverfarms/.test/common/main.test.bicep diff --git a/modules/Microsoft.Web/serverfarms/readme.md b/modules/Web/serverfarms/README.md similarity index 100% rename from modules/Microsoft.Web/serverfarms/readme.md rename to modules/Web/serverfarms/README.md diff --git a/modules/Microsoft.Web/serverfarms/main.bicep b/modules/Web/serverfarms/main.bicep similarity index 100% rename from modules/Microsoft.Web/serverfarms/main.bicep rename to modules/Web/serverfarms/main.bicep diff --git a/modules/Microsoft.Web/serverfarms/version.json b/modules/Web/serverfarms/version.json similarity index 100% rename from modules/Microsoft.Web/serverfarms/version.json rename to modules/Web/serverfarms/version.json diff --git a/modules/Microsoft.Web/sites/.bicep/nested_roleAssignments.bicep b/modules/Web/sites/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Web/sites/.bicep/nested_roleAssignments.bicep rename to modules/Web/sites/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Web/sites/.test/functionAppCommon/dependencies.bicep b/modules/Web/sites/.test/functionAppCommon/dependencies.bicep similarity index 100% rename from modules/Microsoft.Web/sites/.test/functionAppCommon/dependencies.bicep rename to modules/Web/sites/.test/functionAppCommon/dependencies.bicep diff --git a/modules/Microsoft.Web/sites/.test/functionAppCommon/main.test.bicep b/modules/Web/sites/.test/functionAppCommon/main.test.bicep similarity index 100% rename from modules/Microsoft.Web/sites/.test/functionAppCommon/main.test.bicep rename to modules/Web/sites/.test/functionAppCommon/main.test.bicep diff --git a/modules/Microsoft.Web/sites/.test/functionAppMin/dependencies.bicep b/modules/Web/sites/.test/functionAppMin/dependencies.bicep similarity index 100% rename from modules/Microsoft.Web/sites/.test/functionAppMin/dependencies.bicep rename to modules/Web/sites/.test/functionAppMin/dependencies.bicep diff --git a/modules/Microsoft.Web/sites/.test/functionAppMin/main.test.bicep b/modules/Web/sites/.test/functionAppMin/main.test.bicep similarity index 100% rename from modules/Microsoft.Web/sites/.test/functionAppMin/main.test.bicep rename to modules/Web/sites/.test/functionAppMin/main.test.bicep diff --git a/modules/Microsoft.Web/sites/.test/webAppCommon/dependencies.bicep b/modules/Web/sites/.test/webAppCommon/dependencies.bicep similarity index 100% rename from modules/Microsoft.Web/sites/.test/webAppCommon/dependencies.bicep rename to modules/Web/sites/.test/webAppCommon/dependencies.bicep diff --git a/modules/Microsoft.Web/sites/.test/webAppCommon/main.test.bicep b/modules/Web/sites/.test/webAppCommon/main.test.bicep similarity index 100% rename from modules/Microsoft.Web/sites/.test/webAppCommon/main.test.bicep rename to modules/Web/sites/.test/webAppCommon/main.test.bicep diff --git a/modules/Microsoft.Web/sites/.test/webAppMin/dependencies.bicep b/modules/Web/sites/.test/webAppMin/dependencies.bicep similarity index 100% rename from modules/Microsoft.Web/sites/.test/webAppMin/dependencies.bicep rename to modules/Web/sites/.test/webAppMin/dependencies.bicep diff --git a/modules/Microsoft.Web/sites/.test/webAppMin/main.test.bicep b/modules/Web/sites/.test/webAppMin/main.test.bicep similarity index 100% rename from modules/Microsoft.Web/sites/.test/webAppMin/main.test.bicep rename to modules/Web/sites/.test/webAppMin/main.test.bicep diff --git a/modules/Microsoft.Web/sites/readme.md b/modules/Web/sites/README.md similarity index 100% rename from modules/Microsoft.Web/sites/readme.md rename to modules/Web/sites/README.md diff --git a/modules/Microsoft.Web/sites/basicPublishingCredentialsPolicies/readme.md b/modules/Web/sites/basicPublishingCredentialsPolicies/README.md similarity index 100% rename from modules/Microsoft.Web/sites/basicPublishingCredentialsPolicies/readme.md rename to modules/Web/sites/basicPublishingCredentialsPolicies/README.md diff --git a/modules/Microsoft.Web/sites/basicPublishingCredentialsPolicies/main.bicep b/modules/Web/sites/basicPublishingCredentialsPolicies/main.bicep similarity index 100% rename from modules/Microsoft.Web/sites/basicPublishingCredentialsPolicies/main.bicep rename to modules/Web/sites/basicPublishingCredentialsPolicies/main.bicep diff --git a/modules/Microsoft.Web/sites/basicPublishingCredentialsPolicies/version.json b/modules/Web/sites/basicPublishingCredentialsPolicies/version.json similarity index 100% rename from modules/Microsoft.Web/sites/basicPublishingCredentialsPolicies/version.json rename to modules/Web/sites/basicPublishingCredentialsPolicies/version.json diff --git a/modules/Microsoft.Web/sites/config-appsettings/readme.md b/modules/Web/sites/config-appsettings/README.md similarity index 100% rename from modules/Microsoft.Web/sites/config-appsettings/readme.md rename to modules/Web/sites/config-appsettings/README.md diff --git a/modules/Microsoft.Web/sites/config-appsettings/main.bicep b/modules/Web/sites/config-appsettings/main.bicep similarity index 100% rename from modules/Microsoft.Web/sites/config-appsettings/main.bicep rename to modules/Web/sites/config-appsettings/main.bicep diff --git a/modules/Microsoft.Web/sites/config-appsettings/version.json b/modules/Web/sites/config-appsettings/version.json similarity index 100% rename from modules/Microsoft.Web/sites/config-appsettings/version.json rename to modules/Web/sites/config-appsettings/version.json diff --git a/modules/Microsoft.Web/sites/config-authsettingsv2/readme.md b/modules/Web/sites/config-authsettingsv2/README.md similarity index 100% rename from modules/Microsoft.Web/sites/config-authsettingsv2/readme.md rename to modules/Web/sites/config-authsettingsv2/README.md diff --git a/modules/Microsoft.Web/sites/config-authsettingsv2/main.bicep b/modules/Web/sites/config-authsettingsv2/main.bicep similarity index 100% rename from modules/Microsoft.Web/sites/config-authsettingsv2/main.bicep rename to modules/Web/sites/config-authsettingsv2/main.bicep diff --git a/modules/Microsoft.Web/sites/config-authsettingsv2/version.json b/modules/Web/sites/config-authsettingsv2/version.json similarity index 100% rename from modules/Microsoft.Web/sites/config-authsettingsv2/version.json rename to modules/Web/sites/config-authsettingsv2/version.json diff --git a/modules/Microsoft.Web/sites/main.bicep b/modules/Web/sites/main.bicep similarity index 100% rename from modules/Microsoft.Web/sites/main.bicep rename to modules/Web/sites/main.bicep diff --git a/modules/Microsoft.Web/sites/slots/.bicep/nested_roleAssignments.bicep b/modules/Web/sites/slots/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Web/sites/slots/.bicep/nested_roleAssignments.bicep rename to modules/Web/sites/slots/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Web/sites/slots/readme.md b/modules/Web/sites/slots/README.md similarity index 100% rename from modules/Microsoft.Web/sites/slots/readme.md rename to modules/Web/sites/slots/README.md diff --git a/modules/Microsoft.Web/sites/slots/config-appsettings/readme.md b/modules/Web/sites/slots/config-appsettings/README.md similarity index 100% rename from modules/Microsoft.Web/sites/slots/config-appsettings/readme.md rename to modules/Web/sites/slots/config-appsettings/README.md diff --git a/modules/Microsoft.Web/sites/slots/config-appsettings/main.bicep b/modules/Web/sites/slots/config-appsettings/main.bicep similarity index 100% rename from modules/Microsoft.Web/sites/slots/config-appsettings/main.bicep rename to modules/Web/sites/slots/config-appsettings/main.bicep diff --git a/modules/Microsoft.Web/sites/slots/config-appsettings/version.json b/modules/Web/sites/slots/config-appsettings/version.json similarity index 100% rename from modules/Microsoft.Web/sites/slots/config-appsettings/version.json rename to modules/Web/sites/slots/config-appsettings/version.json diff --git a/modules/Microsoft.Web/sites/slots/config-authsettingsv2/readme.md b/modules/Web/sites/slots/config-authsettingsv2/README.md similarity index 100% rename from modules/Microsoft.Web/sites/slots/config-authsettingsv2/readme.md rename to modules/Web/sites/slots/config-authsettingsv2/README.md diff --git a/modules/Microsoft.Web/sites/slots/config-authsettingsv2/main.bicep b/modules/Web/sites/slots/config-authsettingsv2/main.bicep similarity index 100% rename from modules/Microsoft.Web/sites/slots/config-authsettingsv2/main.bicep rename to modules/Web/sites/slots/config-authsettingsv2/main.bicep diff --git a/modules/Microsoft.Web/sites/slots/config-authsettingsv2/version.json b/modules/Web/sites/slots/config-authsettingsv2/version.json similarity index 100% rename from modules/Microsoft.Web/sites/slots/config-authsettingsv2/version.json rename to modules/Web/sites/slots/config-authsettingsv2/version.json diff --git a/modules/Microsoft.Web/sites/slots/main.bicep b/modules/Web/sites/slots/main.bicep similarity index 100% rename from modules/Microsoft.Web/sites/slots/main.bicep rename to modules/Web/sites/slots/main.bicep diff --git a/modules/Microsoft.Web/sites/slots/version.json b/modules/Web/sites/slots/version.json similarity index 100% rename from modules/Microsoft.Web/sites/slots/version.json rename to modules/Web/sites/slots/version.json diff --git a/modules/Microsoft.Web/sites/version.json b/modules/Web/sites/version.json similarity index 100% rename from modules/Microsoft.Web/sites/version.json rename to modules/Web/sites/version.json diff --git a/modules/Microsoft.Web/staticSites/.bicep/nested_roleAssignments.bicep b/modules/Web/staticSites/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/Microsoft.Web/staticSites/.bicep/nested_roleAssignments.bicep rename to modules/Web/staticSites/.bicep/nested_roleAssignments.bicep diff --git a/modules/Microsoft.Web/staticSites/.test/common/dependencies.bicep b/modules/Web/staticSites/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Web/staticSites/.test/common/dependencies.bicep rename to modules/Web/staticSites/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Web/staticSites/.test/common/main.test.bicep b/modules/Web/staticSites/.test/common/main.test.bicep similarity index 100% rename from modules/Microsoft.Web/staticSites/.test/common/main.test.bicep rename to modules/Web/staticSites/.test/common/main.test.bicep diff --git a/modules/Microsoft.Web/staticSites/.test/min/main.test.bicep b/modules/Web/staticSites/.test/min/main.test.bicep similarity index 100% rename from modules/Microsoft.Web/staticSites/.test/min/main.test.bicep rename to modules/Web/staticSites/.test/min/main.test.bicep diff --git a/modules/Microsoft.Web/staticSites/readme.md b/modules/Web/staticSites/README.md similarity index 100% rename from modules/Microsoft.Web/staticSites/readme.md rename to modules/Web/staticSites/README.md diff --git a/modules/Microsoft.Web/staticSites/config/readme.md b/modules/Web/staticSites/config/README.md similarity index 100% rename from modules/Microsoft.Web/staticSites/config/readme.md rename to modules/Web/staticSites/config/README.md diff --git a/modules/Microsoft.Web/staticSites/config/main.bicep b/modules/Web/staticSites/config/main.bicep similarity index 100% rename from modules/Microsoft.Web/staticSites/config/main.bicep rename to modules/Web/staticSites/config/main.bicep diff --git a/modules/Microsoft.Web/staticSites/config/version.json b/modules/Web/staticSites/config/version.json similarity index 100% rename from modules/Microsoft.Web/staticSites/config/version.json rename to modules/Web/staticSites/config/version.json diff --git a/modules/Microsoft.Web/staticSites/customDomains/readme.md b/modules/Web/staticSites/customDomains/README.md similarity index 100% rename from modules/Microsoft.Web/staticSites/customDomains/readme.md rename to modules/Web/staticSites/customDomains/README.md diff --git a/modules/Microsoft.Web/staticSites/customDomains/main.bicep b/modules/Web/staticSites/customDomains/main.bicep similarity index 100% rename from modules/Microsoft.Web/staticSites/customDomains/main.bicep rename to modules/Web/staticSites/customDomains/main.bicep diff --git a/modules/Microsoft.Web/staticSites/customDomains/version.json b/modules/Web/staticSites/customDomains/version.json similarity index 100% rename from modules/Microsoft.Web/staticSites/customDomains/version.json rename to modules/Web/staticSites/customDomains/version.json diff --git a/modules/Microsoft.Web/staticSites/linkedBackends/readme.md b/modules/Web/staticSites/linkedBackends/README.md similarity index 100% rename from modules/Microsoft.Web/staticSites/linkedBackends/readme.md rename to modules/Web/staticSites/linkedBackends/README.md diff --git a/modules/Microsoft.Web/staticSites/linkedBackends/main.bicep b/modules/Web/staticSites/linkedBackends/main.bicep similarity index 100% rename from modules/Microsoft.Web/staticSites/linkedBackends/main.bicep rename to modules/Web/staticSites/linkedBackends/main.bicep diff --git a/modules/Microsoft.Web/staticSites/linkedBackends/version.json b/modules/Web/staticSites/linkedBackends/version.json similarity index 100% rename from modules/Microsoft.Web/staticSites/linkedBackends/version.json rename to modules/Web/staticSites/linkedBackends/version.json diff --git a/modules/Microsoft.Web/staticSites/main.bicep b/modules/Web/staticSites/main.bicep similarity index 100% rename from modules/Microsoft.Web/staticSites/main.bicep rename to modules/Web/staticSites/main.bicep diff --git a/modules/Microsoft.Web/staticSites/version.json b/modules/Web/staticSites/version.json similarity index 100% rename from modules/Microsoft.Web/staticSites/version.json rename to modules/Web/staticSites/version.json From 03aad54170ea63f4ab85e066b4c17283695e7637 Mon Sep 17 00:00:00 2001 From: Erika Gressi <56914614+eriqua@users.noreply.github.com> Date: Tue, 9 May 2023 11:45:08 +0200 Subject: [PATCH 52/63] Update utilities/pipelines/staticValidation/module.tests.ps1 Co-authored-by: Alexander Sehr --- utilities/pipelines/staticValidation/module.tests.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/utilities/pipelines/staticValidation/module.tests.ps1 b/utilities/pipelines/staticValidation/module.tests.ps1 index e507d7680f..dd130a03a5 100644 --- a/utilities/pipelines/staticValidation/module.tests.ps1 +++ b/utilities/pipelines/staticValidation/module.tests.ps1 @@ -236,7 +236,6 @@ Describe 'Pipeline tests' -Tag 'Pipeline' { ) $pipelinesFolderName = Join-Path $repoRootPath '.azuredevops' 'modulePipelines' - # $pipelineFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() $pipelineFileName = 'ms.{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('-', '').ToLower() $pipelinePath = Join-Path $pipelinesFolderName $pipelineFileName Test-Path $pipelinePath | Should -Be $true -Because "path [$pipelinePath] should exist." From 26188105f0a8e3363f3203f5caad7a698f601ef6 Mon Sep 17 00:00:00 2001 From: Erika Gressi <56914614+eriqua@users.noreply.github.com> Date: Tue, 9 May 2023 11:45:24 +0200 Subject: [PATCH 53/63] Update utilities/pipelines/staticValidation/module.tests.ps1 Co-authored-by: Alexander Sehr --- utilities/pipelines/staticValidation/module.tests.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/utilities/pipelines/staticValidation/module.tests.ps1 b/utilities/pipelines/staticValidation/module.tests.ps1 index dd130a03a5..8971e4a3b8 100644 --- a/utilities/pipelines/staticValidation/module.tests.ps1 +++ b/utilities/pipelines/staticValidation/module.tests.ps1 @@ -256,7 +256,6 @@ Describe 'Pipeline tests' -Tag 'Pipeline' { } $pipelinesFolderName = Join-Path $repoRootPath '.azuredevops' 'modulePipelines' - # $pipelineFileName = '{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('Microsoft', 'ms').ToLower() $pipelineFileName = 'ms.{0}.yml' -f $moduleFolderName.Replace('\', '/').Replace('/', '.').Replace('-', '').ToLower() $pipelineFilePath = Join-Path $pipelinesFolderName $pipelineFileName $pipelineContent = Get-Content -Path $pipelineFilePath From 5bcb58715dd5380b114480ae8a87d6462f24a141 Mon Sep 17 00:00:00 2001 From: Erika Gressi <56914614+eriqua@users.noreply.github.com> Date: Tue, 9 May 2023 11:46:39 +0200 Subject: [PATCH 54/63] Update utilities/pipelines/staticValidation/module.tests.ps1 Co-authored-by: Alexander Sehr --- utilities/pipelines/staticValidation/module.tests.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utilities/pipelines/staticValidation/module.tests.ps1 b/utilities/pipelines/staticValidation/module.tests.ps1 index 8971e4a3b8..9447bfdbd6 100644 --- a/utilities/pipelines/staticValidation/module.tests.ps1 +++ b/utilities/pipelines/staticValidation/module.tests.ps1 @@ -67,7 +67,8 @@ Describe 'File/folder tests' -Tag 'Modules' { [string] $moduleFolderPath ) - $pathExisting = Test-Path (Join-Path -Path $moduleFolderPath 'README.md') + $readMeFilePath = Join-Path -Path $moduleFolderPath 'README.md' + $pathExisting = Test-Path $readMeFilePath $pathExisting | Should -Be $true } From 59c91f38b04c459d6bddd635c1286fe1cd4fe8ab Mon Sep 17 00:00:00 2001 From: Erika Gressi <56914614+eriqua@users.noreply.github.com> Date: Tue, 9 May 2023 11:46:54 +0200 Subject: [PATCH 55/63] Update utilities/pipelines/staticValidation/module.tests.ps1 Co-authored-by: Alexander Sehr --- utilities/pipelines/staticValidation/module.tests.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utilities/pipelines/staticValidation/module.tests.ps1 b/utilities/pipelines/staticValidation/module.tests.ps1 index 9447bfdbd6..7a92f41eff 100644 --- a/utilities/pipelines/staticValidation/module.tests.ps1 +++ b/utilities/pipelines/staticValidation/module.tests.ps1 @@ -70,6 +70,9 @@ Describe 'File/folder tests' -Tag 'Modules' { $readMeFilePath = Join-Path -Path $moduleFolderPath 'README.md' $pathExisting = Test-Path $readMeFilePath $pathExisting | Should -Be $true + + $file = Get-Item -Path $readMeFilePath + $file.Name | Should -BeExactly 'README.md' } It '[] Module should contain a [` .test `] folder.' -TestCases ($moduleFolderTestCases | Where-Object { $_.isTopLevelModule }) { From c276f100e98499d3ae6b494d41b984225c6bc461 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Tue, 9 May 2023 12:02:26 +0200 Subject: [PATCH 56/63] Remove other Microsoft prefix occurrences from docs --- ...ng started - Scenario 1 Consume library.md | 6 ++-- docs/wiki/The CI environment - Publishing.md | 12 +++---- .../The CI environment - Static validation.md | 2 +- docs/wiki/The library - Module usage.md | 16 ++++----- ...ModulesMissingFromPrivateBicepRegistry.ps1 | 18 +++++----- .../Get-ModulesMissingFromTemplateSpecsRG.ps1 | 34 +++++++++---------- ...dulesMissingFromUniversalArtifactsFeed.ps1 | 10 +++--- .../resourcePublish/Get-ModulesToPublish.ps1 | 26 +++++++------- .../Get-PrivateRegistryRepositoryName.ps1 | 4 +-- .../resourcePublish/Get-TemplateSpecsName.ps1 | 4 +-- .../Get-UniversalArtifactsName.ps1 | 4 +-- .../Publish-ModuleToPrivateBicepRegistry.ps1 | 4 +-- .../Publish-ModuleToTemplateSpecsRG.ps1 | 4 +-- ...Publish-ModuleToUniversalArtifactsFeed.ps1 | 4 +-- 14 files changed, 74 insertions(+), 74 deletions(-) diff --git a/docs/wiki/Getting started - Scenario 1 Consume library.md b/docs/wiki/Getting started - Scenario 1 Consume library.md index a217199062..bd31ed6d68 100644 --- a/docs/wiki/Getting started - Scenario 1 Consume library.md +++ b/docs/wiki/Getting started - Scenario 1 Consume library.md @@ -87,7 +87,7 @@ To publish a module by running the script: To publish the Keyvault module with version 0.4.740 on a Template Spec that will be created in the resource group 'artifact-rg' you can execute the following example: ```PowerShell - Publish-ModuleToTemplateSpecsRG -TemplateFilePath "D:\ResourcesModules\modules\Microsoft.KeyVault\vaults\main.bicep" -ModuleVersion "0.4.740" -TemplateSpecsRgName 'artifact-rg' -TemplateSpecsRgLocation 'West Europe' -TemplateSpecsDescription 'CARML KV Template Spec' + Publish-ModuleToTemplateSpecsRG -TemplateFilePath "D:\ResourcesModules\modules\KeyVault\vaults\main.bicep" -ModuleVersion "0.4.740" -TemplateSpecsRgName 'artifact-rg' -TemplateSpecsRgLocation 'West Europe' -TemplateSpecsDescription 'CARML KV Template Spec' ``` If you need to publish more than one module, you could use the following PowerShell script that calls the `'Publish-ModuleToTemplateSpecsRG'` function for each of the modules: @@ -127,7 +127,7 @@ To publish a module by running the script: To publish the Keyvault module with version 0.4.740 on a Bicep Registry called 'adpsxxazacrx001' that will be created in the resource group 'artifact-rg' you can execute the following command: ```PowerShell - Publish-ModuleToPrivateBicepRegistry -TemplateFilePath "D:\ResourcesModules\modules\Microsoft.KeyVault\vaults\main.bicep" -ModuleVersion "0.4.740" -BicepRegistryName 'adpsxxazacrx001' -BicepRegistryRgName 'artifact-rg' + Publish-ModuleToPrivateBicepRegistry -TemplateFilePath "D:\ResourcesModules\modules\KeyVault\vaults\main.bicep" -ModuleVersion "0.4.740" -BicepRegistryName 'adpsxxazacrx001' -BicepRegistryRgName 'artifact-rg' ``` If you need to publish more than one module, you could use the following PowerShell script that calls the `'Publish-ModuleToPrivateBicepRegistry'` function for each of the modules: @@ -167,7 +167,7 @@ To publish a module by running the script: To publish the Keyvault module with version 0.4.740 on an artifact feed called 'Artifacts', in the project 'IaC' on organization 'fabrikam' you can execute the following command: ```PowerShell - Publish-ModuleToUniversalArtifactsFeed -TemplateFilePath "D:\ResourcesModules\modules\Microsoft.KeyVault\vaults\main.bicep" -ModuleVersion "0.4.740" -VstsOrganizationUri 'https://dev.azure.com/fabrikam' -VstsFeedProject 'IaC' -VstsFeedName 'Artifacts' + Publish-ModuleToUniversalArtifactsFeed -TemplateFilePath "D:\ResourcesModules\modules\KeyVault\vaults\main.bicep" -ModuleVersion "0.4.740" -VstsOrganizationUri 'https://dev.azure.com/fabrikam' -VstsFeedProject 'IaC' -VstsFeedName 'Artifacts' ``` If you need to publish more than one module, you could use the following PowerShell script that calls the `'Publish-ModuleToUniversalArtifactsFeed'` function for each of the modules: diff --git a/docs/wiki/The CI environment - Publishing.md b/docs/wiki/The CI environment - Publishing.md index 202939d2a9..d747780c8e 100644 --- a/docs/wiki/The CI environment - Publishing.md +++ b/docs/wiki/The CI environment - Publishing.md @@ -40,10 +40,10 @@ The names of published modules differ slighly depending on the location they are **Examples** - Vaults - - Before: `modules\Microsoft.RecoveryServices\vaults` + - Before: `modules\RecoveryServices\vaults` - After: `ms.recoveryservices.vaults` - ReplicationProtectionContainerMappings - - Before: `modules\Microsoft.RecoveryServices\vaults\replicationFabrics\replicationProtectionContainers\replicationProtectionContainerMappings` + - Before: `modules\RecoveryServices\vaults\replicationFabrics\replicationProtectionContainers\replicationProtectionContainerMappings` - After: `ms.recoveryservices.vaults.replicationfabrics.replicationprotectioncontainers.mappings` @@ -61,10 +61,10 @@ The names of published modules differ slighly depending on the location they are **Examples** - Vaults - - Before: `modules\Microsoft.RecoveryServices\vaults` + - Before: `modules\RecoveryServices\vaults` - After: `bicep/modules/microsoft.recoveryservices.vaults` - ReplicationProtectionContainerMappings - - Before: `modules\Microsoft.RecoveryServices\vaults\replicationFabrics\replicationProtectionContainers\replicationProtectionContainerMappings` + - Before: `modules\RecoveryServices\vaults\replicationFabrics\replicationProtectionContainers\replicationProtectionContainerMappings` - After: `bicep/modules/microsoft.recoveryservices.vaults.replicationfabrics.replicationprotectioncontainers.replicationprotectioncontainermappings` @@ -81,10 +81,10 @@ The names of published modules differ slighly depending on the location they are **Examples** - Vaults - - Before: `modules\Microsoft.RecoveryServices\vaults` + - Before: `modules\RecoveryServices\vaults` - After: `microsoft.recoveryservices.vaults` - ReplicationProtectionContainerMappings - - Before: `modules\Microsoft.RecoveryServices\vaults\replicationFabrics\replicationProtectionContainers\replicationProtectionContainerMappings` + - Before: `modules\RecoveryServices\vaults\replicationFabrics\replicationProtectionContainers\replicationProtectionContainerMappings` - After: `microsoft.recoveryservices.vaults.replicationfabrics.replicationprotectioncontainers.replicationprotectioncontainermappings` diff --git a/docs/wiki/The CI environment - Static validation.md b/docs/wiki/The CI environment - Static validation.md index a2d818bba7..9059eef869 100644 --- a/docs/wiki/The CI environment - Static validation.md +++ b/docs/wiki/The CI environment - Static validation.md @@ -115,7 +115,7 @@ $pathToRepository = '' # REQUIRED INPUT FOR TESTING $TestModuleLocallyInput = @{ - templateFilePath = "$pathToRepository\modules\Microsoft.Authorization\roleDefinitions\main.bicep" + templateFilePath = "$pathToRepository\modules\Authorization\roleDefinitions\main.bicep" PesterTest = $true DeploymentTest = $false ValidationTest = $false diff --git a/docs/wiki/The library - Module usage.md b/docs/wiki/The library - Module usage.md index a9ed5e9495..7038d62ce8 100644 --- a/docs/wiki/The library - Module usage.md +++ b/docs/wiki/The library - Module usage.md @@ -35,7 +35,7 @@ $inputObject = @{ ResourceGroupName = 'ExampleGroup' TemplateParameterFile = 'parameters.json' # Using a local reference - TemplateFile = "$home\ResourceModules\modules\Microsoft.KeyVault\vault\main.bicep" + TemplateFile = "$home\ResourceModules\modules\KeyVault\vault\main.bicep" # Using a remote reference # TemplateUri = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/KeyVault/vaults/main.bicep' } @@ -59,7 +59,7 @@ $inputObject = @{ TemplateParameterFile = 'parameters.json' Location = 'EastUS2' # Using a local reference - TemplateFile = "$home\ResourceModules\modules\Microsoft.Resources\resourceGroups\main.bicep" + TemplateFile = "$home\ResourceModules\modules\Resources\resourceGroups\main.bicep" # Using a remote reference # TemplateUri = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Resources/resourceGroups/main.bicep' } @@ -84,7 +84,7 @@ $inputObject = @{ Location = 'EastUS2' TemplateParameterFile = 'parameters.json' # Using a local reference - TemplateFile = "$home\ResourceModules\modules\Microsoft.Authorization\policyAssignments\managementGroup\main.bicep" + TemplateFile = "$home\ResourceModules\modules\Authorization\policyAssignments\managementGroup\main.bicep" # Using a remote reference # TemplateUri = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Authorization/policyAssignments/managementGroup/main.bicep' } @@ -108,7 +108,7 @@ $inputObject = @{ TemplateParameterFile = 'parameters.json' Location = 'EastUS2' # Using a local reference - TemplateFile = "$home\ResourceModules\modules\Microsoft.Subscription\aliases\main.bicep" + TemplateFile = "$home\ResourceModules\modules\Subscription\aliases\main.bicep" # Using a remote reference # TemplateUri = 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Subscription/aliases/main.bicep' } @@ -135,7 +135,7 @@ $inputObject = @( '--resource-group', 'ExampleGroup', '--parameters', '@parameters.json', # Using a local reference - '--template-file', "$home\ResourceModules\modules\Microsoft.Storage\storageAccounts\main.bicep", + '--template-file', "$home\ResourceModules\modules\Storage\storageAccounts\main.bicep", # Using a remote reference # '--template-uri', 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Storage/storageAccounts/main.bicep' ) @@ -159,7 +159,7 @@ $inputObject = @( '--parameters', '@parameters.json', '--location', 'EastUS2', # Using a local reference - '--template-file', "$home\ResourceModules\modules\Microsoft.Resources\resourceGroups\main.bicep" + '--template-file', "$home\ResourceModules\modules\Resources\resourceGroups\main.bicep" # Using a remote reference # '--template-uri', 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Resources/resourceGroups/main.bicep' ) @@ -184,7 +184,7 @@ $inputObject = @( '--location', 'EastUS2', '--management-group-id', 'myManagementGroup', # Using a local reference - '--template-file', "$home\ResourceModules\modules\Microsoft.Authorization\policyAssignments\managementGroup\main.bicep" + '--template-file', "$home\ResourceModules\modules\Authorization\policyAssignments\managementGroup\main.bicep" # Using a remote reference # '--template-uri', 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Authorization/policyAssignments/managementGroup/main.bicep' ) @@ -208,7 +208,7 @@ $inputObject = @( '--parameters', '@parameters.json', '--location', 'EastUS2', # Using a local reference - '--template-file', "$home\ResourceModules\modules\Microsoft.Subscription\aliases\main.bicep" + '--template-file', "$home\ResourceModules\modules\Subscription\aliases\main.bicep" # Using a remote reference # '--template-uri', 'https://raw.githubusercontent.com/Azure/ResourceModules/main/modules/Subscription/aliases/main.bicep' ) diff --git a/utilities/pipelines/resourcePublish/Get-ModulesMissingFromPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesMissingFromPrivateBicepRegistry.ps1 index 964a09d349..e69d2cdb11 100644 --- a/utilities/pipelines/resourcePublish/Get-ModulesMissingFromPrivateBicepRegistry.ps1 +++ b/utilities/pipelines/resourcePublish/Get-ModulesMissingFromPrivateBicepRegistry.ps1 @@ -19,7 +19,7 @@ Optional. Publish an absolute latest version. Note: This version may include breaking changes and is not recommended for production environments .EXAMPLE -Get-ModulesMissingFromPrivateBicepRegistry -TemplateFilePath 'C:\ResourceModules\modules\Microsoft.Compute\virtualMachines\main.bicep' -BicepRegistryName 'adpsxxazacrx001' -BicepRegistryRgName 'artifacts-rg' +Get-ModulesMissingFromPrivateBicepRegistry -TemplateFilePath 'C:\ResourceModules\modules\Compute\virtualMachines\main.bicep' -BicepRegistryName 'adpsxxazacrx001' -BicepRegistryRgName 'artifacts-rg' Check if either the Virtual Machine module or any of its children (e.g. 'extension') is missing in the Container Registry 'adpsxxazacrx001' of Resource Group 'artifacts-rg' @@ -27,21 +27,21 @@ Returns for example: Name Value ---- ----- Version 0.4.0 -TemplateFilePath C:\ResourceModules\modules\Microsoft.Compute\virtualMachines\extensions\main.bicep +TemplateFilePath C:\ResourceModules\modules\Compute\virtualMachines\extensions\main.bicep Version 0.4 -TemplateFilePath C:\ResourceModules\modules\Microsoft.Compute\virtualMachines\extensions\main.bicep +TemplateFilePath C:\ResourceModules\modules\Compute\virtualMachines\extensions\main.bicep Version 0 -TemplateFilePath C:\ResourceModules\modules\Microsoft.Compute\virtualMachines\extensions\main.bicep +TemplateFilePath C:\ResourceModules\modules\Compute\virtualMachines\extensions\main.bicep Version latest -TemplateFilePath C:\ResourceModules\modules\Microsoft.Compute\virtualMachines\extensions\main.bicep +TemplateFilePath C:\ResourceModules\modules\Compute\virtualMachines\extensions\main.bicep Version 0.6.0 -TemplateFilePath C:\ResourceModules\modules\Microsoft.Compute\virtualMachines\main.bicep +TemplateFilePath C:\ResourceModules\modules\Compute\virtualMachines\main.bicep Version 0.6 -TemplateFilePath C:\ResourceModules\modules\Microsoft.Compute\virtualMachines\main.bicep +TemplateFilePath C:\ResourceModules\modules\Compute\virtualMachines\main.bicep Version 0 -TemplateFilePath C:\ResourceModules\modules\Microsoft.Compute\virtualMachines\main.bicep +TemplateFilePath C:\ResourceModules\modules\Compute\virtualMachines\main.bicep Version latest -TemplateFilePath C:\ResourceModules\modules\Microsoft.Compute\virtualMachines\main.bicep +TemplateFilePath C:\ResourceModules\modules\Compute\virtualMachines\main.bicep #> function Get-ModulesMissingFromPrivateBicepRegistry { diff --git a/utilities/pipelines/resourcePublish/Get-ModulesMissingFromTemplateSpecsRG.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesMissingFromTemplateSpecsRG.ps1 index 5e083d255f..a806e70bd2 100644 --- a/utilities/pipelines/resourcePublish/Get-ModulesMissingFromTemplateSpecsRG.ps1 +++ b/utilities/pipelines/resourcePublish/Get-ModulesMissingFromTemplateSpecsRG.ps1 @@ -16,7 +16,7 @@ Optional. Publish an absolute latest version. Note: This version may include breaking changes and is not recommended for production environments .EXAMPLE -Get-ModulesMissingFromTemplateSpecsRG -TemplateFilePath 'C:\ResourceModules\modules\Microsoft.KeyVault\vaults\main.bicep' -TemplateSpecsRGName 'artifacts-rg' +Get-ModulesMissingFromTemplateSpecsRG -TemplateFilePath 'C:\ResourceModules\modules\KeyVault\vaults\main.bicep' -TemplateSpecsRGName 'artifacts-rg' Check if either the Key Vault module or any of its children (e.g. 'secret') is missing in the Resource Group 'artifacts-rg' @@ -24,37 +24,37 @@ Returns for example: Name Value ---- ----- Version 0.4.0 -TemplateFilePath C:\ResourceModules\modules\Microsoft.KeyVault\vaults\accessPolicies\main.bicep +TemplateFilePath C:\ResourceModules\modules\KeyVault\vaults\accessPolicies\main.bicep Version 0.4 -TemplateFilePath C:\ResourceModules\modules\Microsoft.KeyVault\vaults\accessPolicies\main.bicep +TemplateFilePath C:\ResourceModules\modules\KeyVault\vaults\accessPolicies\main.bicep Version 0 -TemplateFilePath C:\ResourceModules\modules\Microsoft.KeyVault\vaults\accessPolicies\main.bicep +TemplateFilePath C:\ResourceModules\modules\KeyVault\vaults\accessPolicies\main.bicep Version latest -TemplateFilePath C:\ResourceModules\modules\Microsoft.KeyVault\vaults\accessPolicies\main.bicep +TemplateFilePath C:\ResourceModules\modules\KeyVault\vaults\accessPolicies\main.bicep Version 0.4.0 -TemplateFilePath C:\ResourceModules\modules\Microsoft.KeyVault\vaults\keys\main.bicep +TemplateFilePath C:\ResourceModules\modules\KeyVault\vaults\keys\main.bicep Version 0.4 -TemplateFilePath C:\ResourceModules\modules\Microsoft.KeyVault\vaults\keys\main.bicep +TemplateFilePath C:\ResourceModules\modules\KeyVault\vaults\keys\main.bicep Version 0 -TemplateFilePath C:\ResourceModules\modules\Microsoft.KeyVault\vaults\keys\main.bicep +TemplateFilePath C:\ResourceModules\modules\KeyVault\vaults\keys\main.bicep Version latest -TemplateFilePath C:\ResourceModules\modules\Microsoft.KeyVault\vaults\keys\main.bicep +TemplateFilePath C:\ResourceModules\modules\KeyVault\vaults\keys\main.bicep Version 0.4.0 -TemplateFilePath C:\ResourceModules\modules\Microsoft.KeyVault\vaults\secrets\main.bicep +TemplateFilePath C:\ResourceModules\modules\KeyVault\vaults\secrets\main.bicep Version 0.4 -TemplateFilePath C:\ResourceModules\modules\Microsoft.KeyVault\vaults\secrets\main.bicep +TemplateFilePath C:\ResourceModules\modules\KeyVault\vaults\secrets\main.bicep Version 0 -TemplateFilePath C:\ResourceModules\modules\Microsoft.KeyVault\vaults\secrets\main.bicep +TemplateFilePath C:\ResourceModules\modules\KeyVault\vaults\secrets\main.bicep Version latest -TemplateFilePath C:\ResourceModules\modules\Microsoft.KeyVault\vaults\secrets\main.bicep +TemplateFilePath C:\ResourceModules\modules\KeyVault\vaults\secrets\main.bicep Version 0.5.0 -TemplateFilePath C:\ResourceModules\modules\Microsoft.KeyVault\vaults\main.bicep +TemplateFilePath C:\ResourceModules\modules\KeyVault\vaults\main.bicep Version 0.5 -TemplateFilePath C:\ResourceModules\modules\Microsoft.KeyVault\vaults\main.bicep +TemplateFilePath C:\ResourceModules\modules\KeyVault\vaults\main.bicep Version 0 -TemplateFilePath C:\ResourceModules\modules\Microsoft.KeyVault\vaults\main.bicep +TemplateFilePath C:\ResourceModules\modules\KeyVault\vaults\main.bicep Version latest -TemplateFilePath C:\ResourceModules\modules\Microsoft.KeyVault\vaults\main.bicep +TemplateFilePath C:\ResourceModules\modules\KeyVault\vaults\main.bicep #> function Get-ModulesMissingFromTemplateSpecsRG { diff --git a/utilities/pipelines/resourcePublish/Get-ModulesMissingFromUniversalArtifactsFeed.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesMissingFromUniversalArtifactsFeed.ps1 index 4cd086850b..88d46e800f 100644 --- a/utilities/pipelines/resourcePublish/Get-ModulesMissingFromUniversalArtifactsFeed.ps1 +++ b/utilities/pipelines/resourcePublish/Get-ModulesMissingFromUniversalArtifactsFeed.ps1 @@ -24,7 +24,7 @@ Example: 'Artifacts'. Optional. The bearer token to use to authenticate the request. If not provided it MUST be existing in your environment as `$env:TOKEN` .EXAMPLE -Get-ModulesMissingFromUniversalArtifactsFeed -TemplateFilePath 'C:\modules\Microsoft.KeyVault\vaults\main.bicep' -vstsOrganizationUri 'https://dev.azure.com/fabrikam' -VstsProject 'IaC' -VstsFeedName 'Artifacts' +Get-ModulesMissingFromUniversalArtifactsFeed -TemplateFilePath 'C:\modules\KeyVault\vaults\main.bicep' -vstsOrganizationUri 'https://dev.azure.com/fabrikam' -VstsProject 'IaC' -VstsFeedName 'Artifacts' Check if either the Key Vault module or any of its children (e.g. 'secret') is missing in artifacts feed 'Artifacts' of Azure DevOps project 'https://dev.azure.com/fabrikam/IaC' @@ -32,13 +32,13 @@ Returns for example: Name Value ---- ----- Version 0.4.0 -TemplateFilePath C:\ResourceModules\modules\Microsoft.KeyVault\vaults\accessPolicies\main.bicep +TemplateFilePath C:\ResourceModules\modules\KeyVault\vaults\accessPolicies\main.bicep Version 0.4.0 -TemplateFilePath C:\ResourceModules\modules\Microsoft.KeyVault\vaults\keys\main.bicep +TemplateFilePath C:\ResourceModules\modules\KeyVault\vaults\keys\main.bicep Version 0.4.0 -TemplateFilePath C:\ResourceModules\modules\Microsoft.KeyVault\vaults\secrets\main.bicep +TemplateFilePath C:\ResourceModules\modules\KeyVault\vaults\secrets\main.bicep Version 0.5.0 -TemplateFilePath C:\ResourceModules\modules\Microsoft.KeyVault\vaults\main.bicep +TemplateFilePath C:\ResourceModules\modules\KeyVault\vaults\main.bicep #> function Get-ModulesMissingFromUniversalArtifactsFeed { diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToPublish.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToPublish.ps1 index 1a9e12c63a..84eaa96abb 100644 --- a/utilities/pipelines/resourcePublish/Get-ModulesToPublish.ps1 +++ b/utilities/pipelines/resourcePublish/Get-ModulesToPublish.ps1 @@ -79,9 +79,9 @@ This function will search the current directory and all parent directories for a Mandatory. Path to the folder/file that should be searched .EXAMPLE -Find-TemplateFile -Path "C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables\.bicep\nested_roleAssignments.bicep" +Find-TemplateFile -Path "C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\tableServices\tables\.bicep\nested_roleAssignments.bicep" - Directory: C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables + Directory: C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\tableServices\tables Mode LastWriteTime Length Name ---- ------------- ------ ---- @@ -126,9 +126,9 @@ Find the closest main.bicep/json file to the changed files in the module folder Mandatory. Path to the main/parent module folder. .EXAMPLE -Get-TemplateFileToPublish -ModuleFolderPath "C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\" +Get-TemplateFileToPublish -ModuleFolderPath "C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\" -C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables\main.bicep +C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\tableServices\tables\main.bicep Gets the closest main.bicep/json file to the changed files in the module folder structure. Assuming there is a changed file in 'Microsoft.Storage\storageAccounts\tableServices\tables' @@ -179,15 +179,15 @@ Mandatory. Path to a main.bicep/json file. Optional. If true, the function will recurse up the folder structure to find the closest main.bicep/json file. .EXAMPLE -Get-ParentModuleTemplateFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables\main.bicep' -Recurse +Get-ParentModuleTemplateFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\tableServices\tables\main.bicep' -Recurse - Directory: C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices + Directory: C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\tableServices Mode LastWriteTime Length Name ---- ------------- ------ ---- la--- 05.12.2021 22:45 1427 main.bicep - Directory: C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts + Directory: C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts Mode LastWriteTime Length Name ---- ------------- ------ ---- @@ -268,7 +268,7 @@ The file needs to be in the same folder as the template file itself. Mandatory. Path to a main.bicep/json file. .EXAMPLE -Get-ModuleVersionFromFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables\main.bicep' +Get-ModuleVersionFromFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\tableServices\tables\main.bicep' 0.3 @@ -307,7 +307,7 @@ Patch version number is calculated based on the git commit count on the branch. Mandatory. Path to a main.bicep/json file. .EXAMPLE -Get-NewModuleVersion -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\tableServices\tables\main.bicep' +Get-NewModuleVersion -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\tableServices\tables\main.bicep' 0.3.630 @@ -351,15 +351,15 @@ Optional. Publish an absolute latest version. Note: This version may include breaking changes and is not recommended for production environments .EXAMPLE -Get-ModulesToPublish -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\main.bicep' +Get-ModulesToPublish -TemplateFilePath 'C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\main.bicep' Name Value ---- ----- -TemplateFilePath C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\fileServices\shares\main.bicep +TemplateFilePath C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\fileServices\shares\main.bicep Version 0.3.848-prerelease -TemplateFilePath C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\fileServices\main.bicep +TemplateFilePath C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\fileServices\main.bicep Version 0.3.848-prerelease -TemplateFilePath C:\Repos\Azure\ResourceModules\modules\Microsoft.Storage\storageAccounts\main.bicep +TemplateFilePath C:\Repos\Azure\ResourceModules\modules\Storage\storageAccounts\main.bicep Version 0.3.848-prerelease Generates a hashtable with template file paths to publish and their new versions. diff --git a/utilities/pipelines/resourcePublish/Get-PrivateRegistryRepositoryName.ps1 b/utilities/pipelines/resourcePublish/Get-PrivateRegistryRepositoryName.ps1 index 6150ae8623..e30372cab5 100644 --- a/utilities/pipelines/resourcePublish/Get-PrivateRegistryRepositoryName.ps1 +++ b/utilities/pipelines/resourcePublish/Get-PrivateRegistryRepositoryName.ps1 @@ -9,9 +9,9 @@ Convert the given template file path into a valid Container Registry repository Mandatory. The template file path to convert .EXAMPLE -Get-PrivateRegistryRepositoryName -TemplateFilePath 'C:\modules\Microsoft.KeyVault\vaults\main.bicep' +Get-PrivateRegistryRepositoryName -TemplateFilePath 'C:\modules\KeyVault\vaults\main.bicep' -Convert 'C:\modules\Microsoft.KeyVault\vaults\main.bicep' to e.g. 'bicep/modules/microsoft.keyvault.vaults' +Convert 'C:\modules\KeyVault\vaults\main.bicep' to e.g. 'bicep/modules/microsoft.keyvault.vaults' #> function Get-PrivateRegistryRepositoryName { diff --git a/utilities/pipelines/resourcePublish/Get-TemplateSpecsName.ps1 b/utilities/pipelines/resourcePublish/Get-TemplateSpecsName.ps1 index 21d80d4224..1ae806f51d 100644 --- a/utilities/pipelines/resourcePublish/Get-TemplateSpecsName.ps1 +++ b/utilities/pipelines/resourcePublish/Get-TemplateSpecsName.ps1 @@ -9,9 +9,9 @@ Convert the given template file path into a valid Template Specs repository name Mandatory. The template file path to convert .EXAMPLE -Get-TemplateSpecsName -TemplateFilePath 'C:\modules\Microsoft.KeyVault\vaults\main.bicep' +Get-TemplateSpecsName -TemplateFilePath 'C:\modules\KeyVault\vaults\main.bicep' -Convert 'C:\modules\Microsoft.KeyVault\vaults\main.bicep' to e.g. 'microsoft.keyvault.vaults' +Convert 'C:\modules\KeyVault\vaults\main.bicep' to e.g. 'microsoft.keyvault.vaults' #> function Get-TemplateSpecsName { diff --git a/utilities/pipelines/resourcePublish/Get-UniversalArtifactsName.ps1 b/utilities/pipelines/resourcePublish/Get-UniversalArtifactsName.ps1 index 339a1b48fc..94b80ca56f 100644 --- a/utilities/pipelines/resourcePublish/Get-UniversalArtifactsName.ps1 +++ b/utilities/pipelines/resourcePublish/Get-UniversalArtifactsName.ps1 @@ -10,9 +10,9 @@ Must be lowercase alphanumerics, dashes, dots or underscores, under 256 characte Mandatory. The template file path to convert .EXAMPLE -Get-UniversalArtifactsName -TemplateFilePath 'C:\modules\Microsoft.KeyVault\vaults\main.bicep' +Get-UniversalArtifactsName -TemplateFilePath 'C:\modules\KeyVault\vaults\main.bicep' -Convert 'C:\modules\Microsoft.KeyVault\vaults\main.bicep' to e.g. 'microsoft.keyvault.vaults' +Convert 'C:\modules\KeyVault\vaults\main.bicep' to e.g. 'microsoft.keyvault.vaults' #> function Get-UniversalArtifactsName { diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 index 3c652c24ec..5054f1161c 100644 --- a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 +++ b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 @@ -7,7 +7,7 @@ Publish a new version of a given module to a private bicep registry .PARAMETER TemplateFilePath Mandatory. Path to the module deployment file from root. -Example: 'C:\modules\Microsoft.KeyVault\vaults\main.bicep' +Example: 'C:\modules\KeyVault\vaults\main.bicep' .PARAMETER ModuleVersion Mandatory. Version of the module to publish, following SemVer convention. @@ -26,7 +26,7 @@ Optional. The location of the resourceGroup the private bicep registry is deploy Example: 'West Europe' .EXAMPLE -Publish-ModuleToPrivateBicepRegistry -TemplateFilePath 'C:\modules\Microsoft.KeyVault\vaults\main.bicep' -ModuleVersion '3.0.0-alpha' -BicepRegistryName 'adpsxxazacrx001' -BicepRegistryRgName 'artifacts-rg' +Publish-ModuleToPrivateBicepRegistry -TemplateFilePath 'C:\modules\KeyVault\vaults\main.bicep' -ModuleVersion '3.0.0-alpha' -BicepRegistryName 'adpsxxazacrx001' -BicepRegistryRgName 'artifacts-rg' Try to publish the KeyVault module with version 3.0.0-alpha to a private bicep registry called 'adpsxxazacrx001' in resource group 'artifacts-rg'. #> diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpecsRG.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpecsRG.ps1 index c91c8a8339..219faa7c77 100644 --- a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpecsRG.ps1 +++ b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpecsRG.ps1 @@ -8,7 +8,7 @@ The template spec is set up if not already existing. .PARAMETER TemplateFilePath Mandatory. Path to the module deployment file from root. -Example: 'C:\modules\Microsoft.KeyVault\vaults\main.bicep' +Example: 'C:\modules\KeyVault\vaults\main.bicep' .PARAMETER ModuleVersion Mandatory. Version of the module to publish, following SemVer convention. @@ -27,7 +27,7 @@ Mandatory. The description of the parent template spec. Example: 'iacs key vault' .EXAMPLE -Publish-ModuleToTemplateSpecsRG -TemplateFilePath 'C:\modules\Microsoft.KeyVault\vaults\main.bicep' -ModuleVersion '3.0.0-alpha' -TemplateSpecsRgName 'artifacts-rg' -TemplateSpecsRgLocation 'West Europe' -TemplateSpecsDescription 'iacs key vault' +Publish-ModuleToTemplateSpecsRG -TemplateFilePath 'C:\modules\KeyVault\vaults\main.bicep' -ModuleVersion '3.0.0-alpha' -TemplateSpecsRgName 'artifacts-rg' -TemplateSpecsRgLocation 'West Europe' -TemplateSpecsDescription 'iacs key vault' Try to publish the KeyVault module with version 3.0.0-alpha to a template spec in resource group 'artifacts-rg'. #> diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactsFeed.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactsFeed.ps1 index 5cd722e5f5..bbb1c79684 100644 --- a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactsFeed.ps1 +++ b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactsFeed.ps1 @@ -38,7 +38,7 @@ Publish a new version of a given module to an Azure DevOps artifact feed as a un .PARAMETER TemplateFilePath Mandatory. Path to the module deployment file from root. -Example: 'C:\modules\Microsoft.KeyVault\vaults\main.bicep' +Example: 'C:\modules\KeyVault\vaults\main.bicep' .PARAMETER ModuleVersion Mandatory. Version of the module to publish, following SemVer convention. @@ -60,7 +60,7 @@ Example: 'Artifacts'. Optional. The bearer token to use to authenticate the request. If not provided it MUST be existing in your environment as `$env:TOKEN` .EXAMPLE -Publish-ModuleToUniversalArtifactsFeed -TemplateFilePath 'C:\modules\Microsoft.KeyVault\vaults\main.bicep' -ModuleVersion '3.0.0-alpha' -vstsOrganizationUri 'https://dev.azure.com/fabrikam' -VstsProject 'IaC' -VstsFeedName 'Artifacts' +Publish-ModuleToUniversalArtifactsFeed -TemplateFilePath 'C:\modules\KeyVault\vaults\main.bicep' -ModuleVersion '3.0.0-alpha' -vstsOrganizationUri 'https://dev.azure.com/fabrikam' -VstsProject 'IaC' -VstsFeedName 'Artifacts' Try to publish the KeyVault module with version 3.0.0-alpha to a Universal Package Feed called 'Artifacts' under the project 'IaC'. #> From 1f55affad38cf8b486648c12c32a2e2273aeb34d Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Tue, 9 May 2023 13:57:43 +0200 Subject: [PATCH 57/63] temp publish test --- .github/workflows/template.module.yml | 164 +++++++++--------- .../Publish-ModuleToPrivateBicepRegistry.ps1 | 5 + 2 files changed, 87 insertions(+), 82 deletions(-) diff --git a/.github/workflows/template.module.yml b/.github/workflows/template.module.yml index d368c1c55a..097370177e 100644 --- a/.github/workflows/template.module.yml +++ b/.github/workflows/template.module.yml @@ -25,88 +25,88 @@ env: TOKEN_NAMEPREFIX: '${{ secrets.TOKEN_NAMEPREFIX }}' jobs: - ######################### - # Static validation # - ######################### - job_module_static_validation: # Note: Please don't change this job name. It is used by the setEnvironment action to define which PS modules to install on runners. - name: 'Static validation' - runs-on: ubuntu-20.04 - if: (fromJson(inputs.workflowInput)).staticValidation == 'true' - steps: - - name: 'Checkout' - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Set environment - uses: ./.github/actions/templates/setEnvironment - with: - variablesPath: ${{ env.variablesPath }} - - name: 'Run tests' - uses: ./.github/actions/templates/validateModulePester - with: - modulePath: '${{ inputs.modulePath }}' - moduleTestFilePath: '${{ env.moduleTestFilePath }}' + # ######################### + # # Static validation # + # ######################### + # job_module_static_validation: # Note: Please don't change this job name. It is used by the setEnvironment action to define which PS modules to install on runners. + # name: 'Static validation' + # runs-on: ubuntu-20.04 + # if: (fromJson(inputs.workflowInput)).staticValidation == 'true' + # steps: + # - name: 'Checkout' + # uses: actions/checkout@v3 + # with: + # fetch-depth: 0 + # - name: Set environment + # uses: ./.github/actions/templates/setEnvironment + # with: + # variablesPath: ${{ env.variablesPath }} + # - name: 'Run tests' + # uses: ./.github/actions/templates/validateModulePester + # with: + # modulePath: '${{ inputs.modulePath }}' + # moduleTestFilePath: '${{ env.moduleTestFilePath }}' - ######################### - # PSRule validation # - ######################### - job_psrule_test: # Note: Please don't change this job name. It is used by the setEnvironment action to define which PS modules to install on runners. - name: 'PSRule validation' - runs-on: ubuntu-20.04 - if: (fromJson(inputs.workflowInput)).staticValidation == 'true' - strategy: - fail-fast: false - matrix: - moduleTestFilePaths: ${{ fromJson(inputs.moduleTestFilePaths) }} - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Set environment - uses: ./.github/actions/templates/setEnvironment - with: - variablesPath: ${{ env.variablesPath }} - - name: Set PSRule validation - uses: ./.github/actions/templates/validateModulePSRule - with: - templateFilePath: '${{ inputs.modulePath }}/${{ matrix.moduleTestFilePaths }}' - subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}' - managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}' + # ######################### + # # PSRule validation # + # ######################### + # job_psrule_test: # Note: Please don't change this job name. It is used by the setEnvironment action to define which PS modules to install on runners. + # name: 'PSRule validation' + # runs-on: ubuntu-20.04 + # if: (fromJson(inputs.workflowInput)).staticValidation == 'true' + # strategy: + # fail-fast: false + # matrix: + # moduleTestFilePaths: ${{ fromJson(inputs.moduleTestFilePaths) }} + # steps: + # - name: Checkout + # uses: actions/checkout@v3 + # - name: Set environment + # uses: ./.github/actions/templates/setEnvironment + # with: + # variablesPath: ${{ env.variablesPath }} + # - name: Set PSRule validation + # uses: ./.github/actions/templates/validateModulePSRule + # with: + # templateFilePath: '${{ inputs.modulePath }}/${{ matrix.moduleTestFilePaths }}' + # subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}' + # managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}' - ############################# - # Deployment validation # - ############################# - job_module_deploy_validation: # Note: Please don't change this job name. It is used by the setEnvironment action to define which PS modules to install on runners. - name: 'Deployment validation' - runs-on: ubuntu-20.04 - if: | - !cancelled() && - (fromJson(inputs.workflowInput)).deploymentValidation == 'true' && - needs.job_module_static_validation.result != 'failure' - needs: - - job_module_static_validation - # - job_psrule_test # Ignoring dependency whilst PSRule gets bedded in, in this project - strategy: - fail-fast: false - matrix: - moduleTestFilePaths: ${{ fromJson(inputs.moduleTestFilePaths) }} - steps: - - name: 'Checkout' - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Set environment - uses: ./.github/actions/templates/setEnvironment - with: - variablesPath: ${{ env.variablesPath }} - removeDeployment: '${{ fromJson(inputs.workflowInput).removeDeployment }}' - - name: 'Using test file [${{ matrix.moduleTestFilePaths }}]' - uses: ./.github/actions/templates/validateModuleDeployment - with: - templateFilePath: '${{ inputs.modulePath }}/${{ matrix.moduleTestFilePaths }}' - location: '${{ env.location }}' - subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}' - managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}' - removeDeployment: '${{ fromJson(inputs.workflowInput).removeDeployment }}' + # ############################# + # # Deployment validation # + # ############################# + # job_module_deploy_validation: # Note: Please don't change this job name. It is used by the setEnvironment action to define which PS modules to install on runners. + # name: 'Deployment validation' + # runs-on: ubuntu-20.04 + # if: | + # !cancelled() && + # (fromJson(inputs.workflowInput)).deploymentValidation == 'true' && + # needs.job_module_static_validation.result != 'failure' + # needs: + # - job_module_static_validation + # # - job_psrule_test # Ignoring dependency whilst PSRule gets bedded in, in this project + # strategy: + # fail-fast: false + # matrix: + # moduleTestFilePaths: ${{ fromJson(inputs.moduleTestFilePaths) }} + # steps: + # - name: 'Checkout' + # uses: actions/checkout@v3 + # with: + # fetch-depth: 0 + # - name: Set environment + # uses: ./.github/actions/templates/setEnvironment + # with: + # variablesPath: ${{ env.variablesPath }} + # removeDeployment: '${{ fromJson(inputs.workflowInput).removeDeployment }}' + # - name: 'Using test file [${{ matrix.moduleTestFilePaths }}]' + # uses: ./.github/actions/templates/validateModuleDeployment + # with: + # templateFilePath: '${{ inputs.modulePath }}/${{ matrix.moduleTestFilePaths }}' + # location: '${{ env.location }}' + # subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}' + # managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}' + # removeDeployment: '${{ fromJson(inputs.workflowInput).removeDeployment }}' ################## # Publishing # @@ -115,8 +115,8 @@ jobs: name: 'Publishing' runs-on: ubuntu-20.04 if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || fromJson(inputs.workflowInput).prerelease == 'true' - needs: - - job_module_deploy_validation + # needs: + # - job_module_deploy_validation steps: - name: 'Checkout' uses: actions/checkout@v3 diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 index 5054f1161c..35b5d9d2f8 100644 --- a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 +++ b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 @@ -82,6 +82,11 @@ function Publish-ModuleToPrivateBicepRegistry { # Get a valid Container Registry name $moduleRegistryIdentifier = Get-PrivateRegistryRepositoryName -TemplateFilePath $TemplateFilePath + # TODO remove start + Write-Verbose 'moduleRegistryIdentifier: $moduleRegistryIdentifier' -Verbose + Write-Verbose 'TemplateFilePath: $TemplateFilePath' -Verbose + # TODO remove end + ############################################# ## Publish to private bicep registry ## ############################################# From c51f1592bfcb68dde95c218b9be8693de76d4654 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Tue, 9 May 2023 15:01:39 +0200 Subject: [PATCH 58/63] temp remove storage lock --- modules/Storage/storageAccounts/main.bicep | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/Storage/storageAccounts/main.bicep b/modules/Storage/storageAccounts/main.bicep index e152357fa9..e6b5f49429 100644 --- a/modules/Storage/storageAccounts/main.bicep +++ b/modules/Storage/storageAccounts/main.bicep @@ -323,14 +323,14 @@ resource storageAccount_diagnosticSettings 'Microsoft.Insights/diagnosticSetting scope: storageAccount } -resource storageAccount_lock 'Microsoft.Authorization/locks@2020-05-01' = if (!empty(lock)) { - name: '${storageAccount.name}-${lock}-lock' - properties: { - level: any(lock) - notes: lock == 'CanNotDelete' ? 'Cannot delete resource or child resources.' : 'Cannot modify the resource or child resources.' - } - scope: storageAccount -} +// resource storageAccount_lock 'Microsoft.Authorization/locks@2020-05-01' = if (!empty(lock)) { +// name: '${storageAccount.name}-${lock}-lock' +// properties: { +// level: any(lock) +// notes: lock == 'CanNotDelete' ? 'Cannot delete resource or child resources.' : 'Cannot modify the resource or child resources.' +// } +// scope: storageAccount +// } module storageAccount_roleAssignments '.bicep/nested_roleAssignments.bicep' = [for (roleAssignment, index) in roleAssignments: { name: '${uniqueString(deployment().name, location)}-Storage-Rbac-${index}' From e98eb4affb13835c4adc05be75e44b7fb8f83407 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Tue, 9 May 2023 15:06:57 +0200 Subject: [PATCH 59/63] revert temp remove storage lock --- modules/Storage/storageAccounts/main.bicep | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/Storage/storageAccounts/main.bicep b/modules/Storage/storageAccounts/main.bicep index e6b5f49429..e152357fa9 100644 --- a/modules/Storage/storageAccounts/main.bicep +++ b/modules/Storage/storageAccounts/main.bicep @@ -323,14 +323,14 @@ resource storageAccount_diagnosticSettings 'Microsoft.Insights/diagnosticSetting scope: storageAccount } -// resource storageAccount_lock 'Microsoft.Authorization/locks@2020-05-01' = if (!empty(lock)) { -// name: '${storageAccount.name}-${lock}-lock' -// properties: { -// level: any(lock) -// notes: lock == 'CanNotDelete' ? 'Cannot delete resource or child resources.' : 'Cannot modify the resource or child resources.' -// } -// scope: storageAccount -// } +resource storageAccount_lock 'Microsoft.Authorization/locks@2020-05-01' = if (!empty(lock)) { + name: '${storageAccount.name}-${lock}-lock' + properties: { + level: any(lock) + notes: lock == 'CanNotDelete' ? 'Cannot delete resource or child resources.' : 'Cannot modify the resource or child resources.' + } + scope: storageAccount +} module storageAccount_roleAssignments '.bicep/nested_roleAssignments.bicep' = [for (roleAssignment, index) in roleAssignments: { name: '${uniqueString(deployment().name, location)}-Storage-Rbac-${index}' From da6f370fe94935e693aaa11124f9da6d83d93398 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Tue, 9 May 2023 15:18:09 +0200 Subject: [PATCH 60/63] update hp version --- modules/DesktopVirtualization/hostPools/version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/DesktopVirtualization/hostPools/version.json b/modules/DesktopVirtualization/hostPools/version.json index 56f8d9ca40..badc0a2285 100644 --- a/modules/DesktopVirtualization/hostPools/version.json +++ b/modules/DesktopVirtualization/hostPools/version.json @@ -1,4 +1,4 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "0.4" + "version": "0.5" } From a23ecb23201723535441ae35d05fb4b8e94430b9 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Tue, 9 May 2023 17:30:04 +0200 Subject: [PATCH 61/63] remove microsoft. occurrences --- docs/wiki/The CI environment - Publishing.md | 4 ++-- docs/wiki/The library - Module usage.md | 2 +- .../resourcePublish/Get-PrivateRegistryRepositoryName.ps1 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/wiki/The CI environment - Publishing.md b/docs/wiki/The CI environment - Publishing.md index d747780c8e..ffbef37826 100644 --- a/docs/wiki/The CI environment - Publishing.md +++ b/docs/wiki/The CI environment - Publishing.md @@ -62,10 +62,10 @@ The names of published modules differ slighly depending on the location they are - Vaults - Before: `modules\RecoveryServices\vaults` - - After: `bicep/modules/microsoft.recoveryservices.vaults` + - After: `bicep/modules/recoveryservices.vaults` - ReplicationProtectionContainerMappings - Before: `modules\RecoveryServices\vaults\replicationFabrics\replicationProtectionContainers\replicationProtectionContainerMappings` - - After: `bicep/modules/microsoft.recoveryservices.vaults.replicationfabrics.replicationprotectioncontainers.replicationprotectioncontainermappings` + - After: `bicep/modules/recoveryservices.vaults.replicationfabrics.replicationprotectioncontainers.replicationprotectioncontainermappings` diff --git a/docs/wiki/The library - Module usage.md b/docs/wiki/The library - Module usage.md index 7038d62ce8..195e1166c1 100644 --- a/docs/wiki/The library - Module usage.md +++ b/docs/wiki/The library - Module usage.md @@ -239,7 +239,7 @@ module testDeployment 'ts/modules:microsoft.keyvaults.vaults:1.0.0' = { } // Using Bicep reference -module testDeployment 'br:.azurecr.io/bicep/modules/microsoft.keyvaults.vaults:1.0.0' = { +module testDeployment 'br:.azurecr.io/bicep/modules/keyvaults.vaults:1.0.0' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-example' params: { ... } diff --git a/utilities/pipelines/resourcePublish/Get-PrivateRegistryRepositoryName.ps1 b/utilities/pipelines/resourcePublish/Get-PrivateRegistryRepositoryName.ps1 index e30372cab5..b401fe5d27 100644 --- a/utilities/pipelines/resourcePublish/Get-PrivateRegistryRepositoryName.ps1 +++ b/utilities/pipelines/resourcePublish/Get-PrivateRegistryRepositoryName.ps1 @@ -11,7 +11,7 @@ Mandatory. The template file path to convert .EXAMPLE Get-PrivateRegistryRepositoryName -TemplateFilePath 'C:\modules\KeyVault\vaults\main.bicep' -Convert 'C:\modules\KeyVault\vaults\main.bicep' to e.g. 'bicep/modules/microsoft.keyvault.vaults' +Convert 'C:\modules\KeyVault\vaults\main.bicep' to e.g. 'bicep/modules/keyvault.vaults' #> function Get-PrivateRegistryRepositoryName { From fb46e057a9fb9251f843621c43e37b4828c79b4f Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Tue, 9 May 2023 17:31:36 +0200 Subject: [PATCH 62/63] revert temp changes --- .github/workflows/template.module.yml | 164 +++++++++--------- .../hostPools/version.json | 2 +- .../Publish-ModuleToPrivateBicepRegistry.ps1 | 5 - 3 files changed, 83 insertions(+), 88 deletions(-) diff --git a/.github/workflows/template.module.yml b/.github/workflows/template.module.yml index 097370177e..d368c1c55a 100644 --- a/.github/workflows/template.module.yml +++ b/.github/workflows/template.module.yml @@ -25,88 +25,88 @@ env: TOKEN_NAMEPREFIX: '${{ secrets.TOKEN_NAMEPREFIX }}' jobs: - # ######################### - # # Static validation # - # ######################### - # job_module_static_validation: # Note: Please don't change this job name. It is used by the setEnvironment action to define which PS modules to install on runners. - # name: 'Static validation' - # runs-on: ubuntu-20.04 - # if: (fromJson(inputs.workflowInput)).staticValidation == 'true' - # steps: - # - name: 'Checkout' - # uses: actions/checkout@v3 - # with: - # fetch-depth: 0 - # - name: Set environment - # uses: ./.github/actions/templates/setEnvironment - # with: - # variablesPath: ${{ env.variablesPath }} - # - name: 'Run tests' - # uses: ./.github/actions/templates/validateModulePester - # with: - # modulePath: '${{ inputs.modulePath }}' - # moduleTestFilePath: '${{ env.moduleTestFilePath }}' + ######################### + # Static validation # + ######################### + job_module_static_validation: # Note: Please don't change this job name. It is used by the setEnvironment action to define which PS modules to install on runners. + name: 'Static validation' + runs-on: ubuntu-20.04 + if: (fromJson(inputs.workflowInput)).staticValidation == 'true' + steps: + - name: 'Checkout' + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Set environment + uses: ./.github/actions/templates/setEnvironment + with: + variablesPath: ${{ env.variablesPath }} + - name: 'Run tests' + uses: ./.github/actions/templates/validateModulePester + with: + modulePath: '${{ inputs.modulePath }}' + moduleTestFilePath: '${{ env.moduleTestFilePath }}' - # ######################### - # # PSRule validation # - # ######################### - # job_psrule_test: # Note: Please don't change this job name. It is used by the setEnvironment action to define which PS modules to install on runners. - # name: 'PSRule validation' - # runs-on: ubuntu-20.04 - # if: (fromJson(inputs.workflowInput)).staticValidation == 'true' - # strategy: - # fail-fast: false - # matrix: - # moduleTestFilePaths: ${{ fromJson(inputs.moduleTestFilePaths) }} - # steps: - # - name: Checkout - # uses: actions/checkout@v3 - # - name: Set environment - # uses: ./.github/actions/templates/setEnvironment - # with: - # variablesPath: ${{ env.variablesPath }} - # - name: Set PSRule validation - # uses: ./.github/actions/templates/validateModulePSRule - # with: - # templateFilePath: '${{ inputs.modulePath }}/${{ matrix.moduleTestFilePaths }}' - # subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}' - # managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}' + ######################### + # PSRule validation # + ######################### + job_psrule_test: # Note: Please don't change this job name. It is used by the setEnvironment action to define which PS modules to install on runners. + name: 'PSRule validation' + runs-on: ubuntu-20.04 + if: (fromJson(inputs.workflowInput)).staticValidation == 'true' + strategy: + fail-fast: false + matrix: + moduleTestFilePaths: ${{ fromJson(inputs.moduleTestFilePaths) }} + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Set environment + uses: ./.github/actions/templates/setEnvironment + with: + variablesPath: ${{ env.variablesPath }} + - name: Set PSRule validation + uses: ./.github/actions/templates/validateModulePSRule + with: + templateFilePath: '${{ inputs.modulePath }}/${{ matrix.moduleTestFilePaths }}' + subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}' + managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}' - # ############################# - # # Deployment validation # - # ############################# - # job_module_deploy_validation: # Note: Please don't change this job name. It is used by the setEnvironment action to define which PS modules to install on runners. - # name: 'Deployment validation' - # runs-on: ubuntu-20.04 - # if: | - # !cancelled() && - # (fromJson(inputs.workflowInput)).deploymentValidation == 'true' && - # needs.job_module_static_validation.result != 'failure' - # needs: - # - job_module_static_validation - # # - job_psrule_test # Ignoring dependency whilst PSRule gets bedded in, in this project - # strategy: - # fail-fast: false - # matrix: - # moduleTestFilePaths: ${{ fromJson(inputs.moduleTestFilePaths) }} - # steps: - # - name: 'Checkout' - # uses: actions/checkout@v3 - # with: - # fetch-depth: 0 - # - name: Set environment - # uses: ./.github/actions/templates/setEnvironment - # with: - # variablesPath: ${{ env.variablesPath }} - # removeDeployment: '${{ fromJson(inputs.workflowInput).removeDeployment }}' - # - name: 'Using test file [${{ matrix.moduleTestFilePaths }}]' - # uses: ./.github/actions/templates/validateModuleDeployment - # with: - # templateFilePath: '${{ inputs.modulePath }}/${{ matrix.moduleTestFilePaths }}' - # location: '${{ env.location }}' - # subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}' - # managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}' - # removeDeployment: '${{ fromJson(inputs.workflowInput).removeDeployment }}' + ############################# + # Deployment validation # + ############################# + job_module_deploy_validation: # Note: Please don't change this job name. It is used by the setEnvironment action to define which PS modules to install on runners. + name: 'Deployment validation' + runs-on: ubuntu-20.04 + if: | + !cancelled() && + (fromJson(inputs.workflowInput)).deploymentValidation == 'true' && + needs.job_module_static_validation.result != 'failure' + needs: + - job_module_static_validation + # - job_psrule_test # Ignoring dependency whilst PSRule gets bedded in, in this project + strategy: + fail-fast: false + matrix: + moduleTestFilePaths: ${{ fromJson(inputs.moduleTestFilePaths) }} + steps: + - name: 'Checkout' + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Set environment + uses: ./.github/actions/templates/setEnvironment + with: + variablesPath: ${{ env.variablesPath }} + removeDeployment: '${{ fromJson(inputs.workflowInput).removeDeployment }}' + - name: 'Using test file [${{ matrix.moduleTestFilePaths }}]' + uses: ./.github/actions/templates/validateModuleDeployment + with: + templateFilePath: '${{ inputs.modulePath }}/${{ matrix.moduleTestFilePaths }}' + location: '${{ env.location }}' + subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}' + managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}' + removeDeployment: '${{ fromJson(inputs.workflowInput).removeDeployment }}' ################## # Publishing # @@ -115,8 +115,8 @@ jobs: name: 'Publishing' runs-on: ubuntu-20.04 if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || fromJson(inputs.workflowInput).prerelease == 'true' - # needs: - # - job_module_deploy_validation + needs: + - job_module_deploy_validation steps: - name: 'Checkout' uses: actions/checkout@v3 diff --git a/modules/DesktopVirtualization/hostPools/version.json b/modules/DesktopVirtualization/hostPools/version.json index badc0a2285..56f8d9ca40 100644 --- a/modules/DesktopVirtualization/hostPools/version.json +++ b/modules/DesktopVirtualization/hostPools/version.json @@ -1,4 +1,4 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "0.5" + "version": "0.4" } diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 index 35b5d9d2f8..5054f1161c 100644 --- a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 +++ b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 @@ -82,11 +82,6 @@ function Publish-ModuleToPrivateBicepRegistry { # Get a valid Container Registry name $moduleRegistryIdentifier = Get-PrivateRegistryRepositoryName -TemplateFilePath $TemplateFilePath - # TODO remove start - Write-Verbose 'moduleRegistryIdentifier: $moduleRegistryIdentifier' -Verbose - Write-Verbose 'TemplateFilePath: $TemplateFilePath' -Verbose - # TODO remove end - ############################################# ## Publish to private bicep registry ## ############################################# From f81b6fb9163c0a628a90e9c302b356d9326f99f9 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Tue, 9 May 2023 17:42:56 +0200 Subject: [PATCH 63/63] remove microsoft. occurrences from ts references --- .../virtualMachinesMultiple/readme.md | 4 ++-- docs/wiki/Solution creation.md | 12 ++++++------ docs/wiki/The CI environment - Publishing.md | 4 ++-- docs/wiki/The library - Module usage.md | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/constructs/Microsoft.Compute/virtualMachinesMultiple/readme.md b/constructs/Microsoft.Compute/virtualMachinesMultiple/readme.md index 2a215bd078..0c99e52de9 100644 --- a/constructs/Microsoft.Compute/virtualMachinesMultiple/readme.md +++ b/constructs/Microsoft.Compute/virtualMachinesMultiple/readme.md @@ -293,7 +293,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module virtualMachinesMultiple 'ts/modules:microsoft.compute.virtualmachinesmultiple:1.0.0 = { +module virtualMachinesMultiple 'ts/modules:compute.virtualmachinesmultiple:1.0.0 = { name: '${uniqueString(deployment().name)}-VirtualMachinesMultiple' params: { // Required parameters @@ -430,7 +430,7 @@ module virtualMachinesMultiple 'ts/modules:microsoft.compute.virtualmachinesmult via Bicep module ```bicep -module virtualMachinesMultiple 'ts/modules:microsoft.compute.virtualmachinesmultiple:1.0.0 = { +module virtualMachinesMultiple 'ts/modules:compute.virtualmachinesmultiple:1.0.0 = { name: '${uniqueString(deployment().name)}-VirtualMachinesMultiple' params: { // Required parameters diff --git a/docs/wiki/Solution creation.md b/docs/wiki/Solution creation.md index 66ed9ff3c7..1d27f8b713 100644 --- a/docs/wiki/Solution creation.md +++ b/docs/wiki/Solution creation.md @@ -248,7 +248,7 @@ param location string = deployment().location // =========== // // Resource Group -module rg 'br/modules:microsoft.resources.resourcegroups:1.0.0' = { +module rg 'br/modules:resources.resourcegroups:1.0.0' = { name: 'registry-rg' params: { name: resourceGroupName @@ -257,7 +257,7 @@ module rg 'br/modules:microsoft.resources.resourcegroups:1.0.0' = { } // Network Security Group -module nsg 'br/modules:microsoft.network.networksecuritygroups:1.0.0' = { +module nsg 'br/modules:network.networksecuritygroups:1.0.0' = { name: 'registry-nsg' scope: resourceGroup(resourceGroupName) params: { @@ -269,7 +269,7 @@ module nsg 'br/modules:microsoft.network.networksecuritygroups:1.0.0' = { } // Virtual Network -module vnet 'br/modules:microsoft.network.virtualnetworks:1.0.0' = { +module vnet 'br/modules:network.virtualnetworks:1.0.0' = { name: 'registry-vnet' scope: resourceGroup(resourceGroupName) params: { @@ -338,7 +338,7 @@ param location string = deployment().location // =========== // // Resource Group -module rg 'ts/modules:microsoft.resources.resourcegroups:1.0.0' = { +module rg 'ts/modules:resources.resourcegroups:1.0.0' = { name: 'registry-rg' params: { name: resourceGroupName @@ -347,7 +347,7 @@ module rg 'ts/modules:microsoft.resources.resourcegroups:1.0.0' = { } // Network Security Group -module nsg 'ts/modules:microsoft.network.networksecuritygroups:1.0.0' = { +module nsg 'ts/modules:network.networksecuritygroups:1.0.0' = { name: 'registry-nsg' scope: resourceGroup(resourceGroupName) params: { @@ -359,7 +359,7 @@ module nsg 'ts/modules:microsoft.network.networksecuritygroups:1.0.0' = { } // Virtual Network -module vnet 'ts/modules:microsoft.network.virtualnetworks:1.0.0' = { +module vnet 'ts/modules:network.virtualnetworks:1.0.0' = { name: 'registry-vnet' scope: resourceGroup(resourceGroupName) params: { diff --git a/docs/wiki/The CI environment - Publishing.md b/docs/wiki/The CI environment - Publishing.md index ffbef37826..f0be435a85 100644 --- a/docs/wiki/The CI environment - Publishing.md +++ b/docs/wiki/The CI environment - Publishing.md @@ -100,9 +100,9 @@ The publishing works as follows: 1. The patch (`0.0.x`) version is calculated based on the number of commits on the `HEAD` ref (aka. git height). This will cause the patch version to never reset to 0 with major and/or minor increment, as specified for [semver](https://semver.org/). 1. The module is published with a `major.minor.patch` version (`x.y.z`). For Template Specs and Bicep Registry only, a `major` version (`x`), a `major.minor` version (`x.y`) and a `latest` version are also updated, allowing a consumer to: - Reference the latest version of a major, i.e., the latest minor and patch of a major version. - > Example: Using Template Specs, the reference to a `major` could look like: `ts/modules:microsoft.resources.resourcegroups:1` which means that the template will always consume whatever the potentially overwritten/updated version `1` contains. + > Example: Using Template Specs, the reference to a `major` could look like: `ts/modules:resources.resourcegroups:1` which means that the template will always consume whatever the potentially overwritten/updated version `1` contains. - Reference the latest version of a minor, i.e., the latest patch of a minor version. - > Example: Using the Bicep registry, the reference to a `major.minor` could look like: `br/modules:microsoft.resources.resourcegroups:0.4` which means that the template will always consume whatever the potentially overwritten/updated version `0.4` contains. + > Example: Using the Bicep registry, the reference to a `major.minor` could look like: `br/modules:resources.resourcegroups:0.4` which means that the template will always consume whatever the potentially overwritten/updated version `0.4` contains. 1. For a changed child module, the direct parent hierarchy is also registered for an update, following the same procedure as above. 1. The list of module files paths and their versions are passed on as a array list. 1. The [Get-ModulesMissingFrom*.ps1](https://github.com/Azure/ResourceModules/tree/main/utilities/pipelines/resourcePublish) scripts further check if a given module is missing from the corresponding target location (e.g., Azure Container Registry) and adds each missing entry to to aforementioned array - using the version specified in the module's `version.json` file. diff --git a/docs/wiki/The library - Module usage.md b/docs/wiki/The library - Module usage.md index 195e1166c1..b75ce04014 100644 --- a/docs/wiki/The library - Module usage.md +++ b/docs/wiki/The library - Module usage.md @@ -232,7 +232,7 @@ module testDeployment 'ResourceModules/modules/KeyVaults/vaults/main.bicep' = { } // Using Template-Specs reference (with configuration file) -module testDeployment 'ts/modules:microsoft.keyvaults.vaults:1.0.0' = { +module testDeployment 'ts/modules:keyvaults.vaults:1.0.0' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-example' params: { ... }