From e1b4acbb7969c088564942e16ccfd63b11507824 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Fri, 11 Aug 2023 19:22:40 +0200 Subject: [PATCH 01/15] first run --- Set-CARMLFoldersForPBRSingular.ps1 | 420 ++++++++++++++++++ .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../README.md | 2 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../{servers => server}/.test/main.test.bicep | 0 .../.test/max/dependencies.bicep | 0 .../.test/max/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../{servers => server}/README.md | 6 +- .../{servers => server}/main.bicep | 0 .../{servers => server}/main.json | 0 .../{servers => server}/version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../service/{apis => api}/README.md | 0 .../service/{apis => api}/main.bicep | 2 +- .../service/{apis => api}/main.json | 0 .../service/{apis => api}/policies/README.md | 0 .../service/{apis => api}/policies/main.bicep | 0 .../service/{apis => api}/policies/main.json | 0 .../{apis => api}/policies/version.json | 0 .../service/{apis => api}/version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../service/{backends => backend}/README.md | 0 .../service/{backends => backend}/main.bicep | 0 .../service/{backends => backend}/main.json | 0 .../{backends => backend}/version.json | 0 .../service/{caches => cache}/README.md | 0 .../service/{caches => cache}/main.bicep | 0 .../service/{caches => cache}/main.json | 0 .../service/{caches => cache}/version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 modules/api-management/service/main.bicep | 22 +- .../{named-values => named-value}/README.md | 0 .../{named-values => named-value}/main.bicep | 0 .../{named-values => named-value}/main.json | 0 .../version.json | 0 .../service/{policies => policy}/README.md | 0 .../service/{policies => policy}/main.bicep | 0 .../service/{policies => policy}/main.json | 0 .../service/{policies => policy}/version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../service/{products => product}/README.md | 0 .../{products => product}/apis/README.md | 0 .../{products => product}/apis/main.bicep | 0 .../{products => product}/apis/main.json | 0 .../{products => product}/apis/version.json | 0 .../{products => product}/groups/README.md | 0 .../{products => product}/groups/main.bicep | 0 .../{products => product}/groups/main.json | 0 .../{products => product}/groups/version.json | 0 .../service/{products => product}/main.bicep | 4 +- .../service/{products => product}/main.json | 0 .../{products => product}/version.json | 0 .../{subscriptions => subscription}/README.md | 0 .../main.bicep | 0 .../{subscriptions => subscription}/main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../.test/pe/dependencies.bicep | 0 .../.test/pe/main.test.bicep | 0 .../README.md | 6 +- .../.bicep/nested_roleAssignments.bicep | 0 .../key-values/README.md | 0 .../key-values/main.bicep | 0 .../key-values/main.json | 0 .../key-values/version.json | 0 .../main.bicep | 4 +- .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.test/common/main.test.bicep | 0 .../{locks => lock}/.test/main.test.bicep | 0 .../authorization/{locks => lock}/README.md | 2 +- .../authorization/{locks => lock}/main.bicep | 0 .../authorization/{locks => lock}/main.json | 0 .../{locks => lock}/resource-group/README.md | 0 .../{locks => lock}/resource-group/main.bicep | 0 .../{locks => lock}/resource-group/main.json | 0 .../resource-group/version.json | 0 .../{locks => lock}/subscription/README.md | 0 .../{locks => lock}/subscription/main.bicep | 0 .../{locks => lock}/subscription/main.json | 0 .../{locks => lock}/subscription/version.json | 0 .../{locks => lock}/version.json | 0 .../.test/main.test.bicep | 0 .../.test/mg.common/main.test.bicep | 0 .../.test/mg.min/main.test.bicep | 0 .../.test/rg.common/dependencies.bicep | 0 .../.test/rg.common/main.test.bicep | 0 .../.test/rg.min/main.test.bicep | 0 .../.test/sub.common/dependencies.bicep | 0 .../.test/sub.common/main.test.bicep | 0 .../.test/sub.min/main.test.bicep | 0 .../README.md | 14 +- .../main.bicep | 0 .../main.json | 0 .../management-group/README.md | 0 .../management-group/main.bicep | 0 .../management-group/main.json | 0 .../management-group/version.json | 0 .../resource-group/README.md | 0 .../resource-group/main.bicep | 0 .../resource-group/main.json | 0 .../resource-group/version.json | 0 .../subscription/README.md | 0 .../subscription/main.bicep | 0 .../subscription/main.json | 0 .../subscription/version.json | 0 .../version.json | 0 .../.test/main.test.bicep | 0 .../.test/mg.common/main.test.bicep | 0 .../.test/mg.min/main.test.bicep | 0 .../.test/sub.common/main.test.bicep | 0 .../.test/sub.min/main.test.bicep | 0 .../README.md | 10 +- .../main.bicep | 0 .../main.json | 0 .../management-group/README.md | 0 .../management-group/main.bicep | 0 .../management-group/main.json | 0 .../management-group/version.json | 0 .../subscription/README.md | 0 .../subscription/main.bicep | 0 .../subscription/main.json | 0 .../subscription/version.json | 0 .../version.json | 0 .../.test/main.test.bicep | 0 .../.test/mg.common/main.test.bicep | 0 .../.test/mg.min/main.test.bicep | 0 .../.test/rg.common/main.test.bicep | 0 .../.test/rg.min/main.test.bicep | 0 .../.test/sub.common/main.test.bicep | 0 .../.test/sub.min/main.test.bicep | 0 .../README.md | 16 +- .../main.bicep | 0 .../main.json | 0 .../management-group/README.md | 0 .../management-group/main.bicep | 0 .../management-group/main.json | 0 .../management-group/version.json | 0 .../resource-group/README.md | 0 .../resource-group/main.bicep | 0 .../resource-group/main.json | 0 .../resource-group/version.json | 0 .../subscription/README.md | 0 .../subscription/main.bicep | 0 .../subscription/main.json | 0 .../subscription/version.json | 0 .../version.json | 0 .../.test/main.test.bicep | 0 .../.test/mg.common/main.test.bicep | 0 .../.test/mg.min/main.test.bicep | 0 .../.test/sub.common/main.test.bicep | 0 .../.test/sub.min/main.test.bicep | 0 .../README.md | 12 +- .../main.bicep | 0 .../main.json | 0 .../management-group/README.md | 0 .../management-group/main.bicep | 0 .../management-group/main.json | 0 .../management-group/version.json | 0 .../subscription/README.md | 0 .../subscription/main.bicep | 0 .../subscription/main.json | 0 .../subscription/version.json | 0 .../version.json | 0 .../.test/main.test.bicep | 0 .../.test/mg.common/dependencies.bicep | 0 .../mg.common/interim.dependencies.bicep | 0 .../.test/mg.common/main.test.bicep | 0 .../.test/mg.min/dependencies.bicep | 0 .../.test/mg.min/interim.dependencies.bicep | 0 .../.test/mg.min/main.test.bicep | 0 .../.test/rg.common/dependencies.bicep | 0 .../.test/rg.common/main.test.bicep | 0 .../.test/rg.min/dependencies.bicep | 0 .../.test/rg.min/main.test.bicep | 0 .../.test/sub.common/dependencies.bicep | 0 .../.test/sub.common/main.test.bicep | 0 .../.test/sub.min/dependencies.bicep | 0 .../.test/sub.min/main.test.bicep | 0 .../README.md | 14 +- .../main.bicep | 0 .../main.json | 0 .../management-group/README.md | 0 .../management-group/main.bicep | 0 .../management-group/main.json | 0 .../management-group/version.json | 0 .../resource-group/README.md | 0 .../resource-group/main.bicep | 0 .../resource-group/main.json | 0 .../resource-group/version.json | 0 .../subscription/README.md | 0 .../subscription/main.bicep | 0 .../subscription/main.json | 0 .../subscription/version.json | 0 .../version.json | 0 .../.test/main.test.bicep | 0 .../.test/mg.common/main.test.bicep | 0 .../.test/mg.min/main.test.bicep | 0 .../.test/rg.common/main.test.bicep | 0 .../.test/rg.min/main.test.bicep | 0 .../.test/sub.common/main.test.bicep | 0 .../.test/sub.min/main.test.bicep | 0 .../README.md | 14 +- .../main.bicep | 0 .../main.json | 0 .../management-group/README.md | 0 .../management-group/main.bicep | 0 .../management-group/main.json | 0 .../management-group/version.json | 0 .../resource-group/README.md | 0 .../resource-group/main.bicep | 0 .../resource-group/main.json | 0 .../resource-group/version.json | 0 .../subscription/README.md | 0 .../subscription/main.bicep | 0 .../subscription/main.json | 0 .../subscription/version.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/encr/dependencies.bicep | 0 .../.test/encr/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 6 +- .../job-schedules/README.md | 0 .../job-schedules/main.bicep | 0 .../job-schedules/main.json | 0 .../job-schedules/version.json | 0 .../main.bicep | 18 +- .../main.json | 0 .../modules/README.md | 0 .../modules/main.bicep | 0 .../modules/main.json | 0 .../modules/version.json | 0 .../runbooks/README.md | 0 .../runbooks/main.bicep | 0 .../runbooks/main.json | 0 .../runbooks/version.json | 0 .../schedules/README.md | 0 .../schedules/main.bicep | 0 .../schedules/main.json | 0 .../schedules/version.json | 0 .../software-update-configurations/README.md | 0 .../software-update-configurations/main.bicep | 0 .../software-update-configurations/main.json | 0 .../version.json | 0 .../variables/README.md | 0 .../variables/main.bicep | 0 .../variables/main.json | 0 .../variables/version.json | 0 .../version.json | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/encr/dependencies.bicep | 0 .../.test/encr/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 6 +- .../main.bicep | 2 +- .../main.json | 0 .../version.json | 0 modules/cache/redis/main.bicep | 2 +- modules/cdn/profiles/README.md | 2 +- .../{endpoints => endpoint}/README.md | 0 .../{endpoints => endpoint}/main.bicep | 2 +- .../{endpoints => endpoint}/main.json | 0 .../{endpoints => endpoint}/origins/README.md | 0 .../origins/main.bicep | 0 .../{endpoints => endpoint}/origins/main.json | 0 .../origins/version.json | 0 .../{endpoints => endpoint}/version.json | 0 modules/cdn/profiles/main.bicep | 2 +- .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/encr/dependencies.bicep | 0 .../.test/encr/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../.test/speech/dependencies.bicep | 0 .../.test/speech/main.test.bicep | 0 .../{accounts => account}/README.md | 8 +- .../{accounts => account}/main.bicep | 2 +- .../{accounts => account}/main.json | 0 .../{accounts => account}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_keyVaultPermissions.bicep | 2 +- .../nested_managedIdentityReference.bicep | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/accessPolicies/dependencies.bicep | 0 .../.test/accessPolicies/main.test.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/image/dependencies.bicep | 0 .../.test/image/main.test.bicep | 0 .../.test/import/dependencies.bicep | 0 .../.test/import/dependencies_rbac.bicep | 0 .../.test/import/main.test.bicep | 0 .../{disks => disk}/.test/main.test.bicep | 0 .../{disks => disk}/.test/min/main.test.bicep | 0 modules/compute/{disks => disk}/README.md | 8 +- modules/compute/{disks => disk}/main.bicep | 0 modules/compute/{disks => disk}/main.json | 0 modules/compute/{disks => disk}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../compute/{galleries => gallery}/README.md | 4 +- .../.bicep/nested_roleAssignments.bicep | 0 .../applications/README.md | 0 .../applications/main.bicep | 0 .../applications/main.json | 0 .../applications/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../{galleries => gallery}/images/README.md | 0 .../{galleries => gallery}/images/main.bicep | 0 .../{galleries => gallery}/images/main.json | 0 .../images/version.json | 0 .../compute/{galleries => gallery}/main.bicep | 4 +- .../compute/{galleries => gallery}/main.json | 0 .../{galleries => gallery}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/dependencies_rbac.bicep | 0 .../.test/common/main.test.bicep | 0 .../{images => image}/.test/main.test.bicep | 0 modules/compute/{images => image}/README.md | 2 +- modules/compute/{images => image}/main.bicep | 0 modules/compute/{images => image}/main.json | 0 .../compute/{images => image}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/linux.min/dependencies.bicep | 0 .../.test/linux.min/main.test.bicep | 0 .../.test/linux.ssecmk/dependencies.bicep | 0 .../.test/linux.ssecmk/main.test.bicep | 0 .../.test/linux/dependencies.bicep | 0 .../.test/linux/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/windows.min/dependencies.bicep | 0 .../.test/windows.min/main.test.bicep | 0 .../.test/windows/dependencies.bicep | 0 .../.test/windows/main.test.bicep | 0 .../README.md | 10 +- .../extensions/README.md | 0 .../extensions/main.bicep | 0 .../extensions/main.json | 0 .../extensions/version.json | 0 .../main.bicep | 16 +- .../main.json | 0 .../version.json | 0 .../.bicep/nested_networkInterface.bicep | 4 +- .../.bicep/nested_roleAssignments.bicep | 0 .../.test/linux.atmg/dependencies.bicep | 0 .../.test/linux.atmg/main.test.bicep | 0 .../.test/linux.min/dependencies.bicep | 0 .../.test/linux.min/main.test.bicep | 0 .../.test/linux/dependencies.bicep | 0 .../.test/linux/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/windows.atmg/dependencies.bicep | 0 .../.test/windows.atmg/main.test.bicep | 0 .../.test/windows.min/dependencies.bicep | 0 .../.test/windows.min/main.test.bicep | 0 .../.test/windows.ssecmk/dependencies.bicep | 0 .../.test/windows.ssecmk/main.test.bicep | 0 .../.test/windows/dependencies.bicep | 0 .../.test/windows/main.test.bicep | 0 .../README.md | 14 +- .../extensions/README.md | 0 .../extensions/main.bicep | 0 .../extensions/main.json | 0 .../extensions/version.json | 0 .../main.bicep | 20 +- .../main.json | 0 .../version.json | 0 .../.test/common/main.test.bicep | 0 .../{budgets => budget}/.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../consumption/{budgets => budget}/README.md | 4 +- .../{budgets => budget}/main.bicep | 0 .../consumption/{budgets => budget}/main.json | 0 .../{budgets => budget}/version.json | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/encr/dependencies.bicep | 0 .../.test/encr/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../.test/private/dependencies.bicep | 0 .../.test/private/main.test.bicep | 0 .../README.md | 8 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/encr/dependencies.bicep | 0 .../.test/encr/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../.test/pe/dependencies.bicep | 0 .../.test/pe/main.test.bicep | 0 .../{registries => registry}/README.md | 8 +- .../{registries => registry}/main.bicep | 6 +- .../{registries => registry}/main.json | 0 .../replications/README.md | 0 .../replications/main.bicep | 0 .../replications/main.json | 0 .../replications/version.json | 0 .../{registries => registry}/version.json | 0 .../webhooks/README.md | 0 .../webhooks/main.bicep | 0 .../webhooks/main.json | 0 .../webhooks/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/azure/dependencies.bicep | 0 .../.test/azure/main.test.bicep | 0 .../.test/kubenet/dependencies.bicep | 0 .../.test/kubenet/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../.test/priv/dependencies.bicep | 0 .../.test/priv/main.test.bicep | 0 .../README.md | 8 +- .../agent-pools/README.md | 0 .../agent-pools/main.bicep | 0 .../agent-pools/main.json | 0 .../agent-pools/version.json | 0 .../main.bicep | 4 +- .../main.json | 0 .../version.json | 0 modules/data-factory/factories/README.md | 4 +- .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 modules/data-factory/factories/main.bicep | 6 +- .../README.md | 0 .../main.bicep | 2 +- .../main.json | 0 .../managed-private-endpoints/README.md | 0 .../managed-private-endpoints/main.bicep | 0 .../managed-private-endpoints/main.json | 0 .../managed-private-endpoints/version.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../{backup-vaults => backup-vault}/README.md | 4 +- .../backup-policies/README.md | 0 .../backup-policies/main.bicep | 0 .../backup-policies/main.json | 0 .../backup-policies/version.json | 0 .../main.bicep | 2 +- .../{backup-vaults => backup-vault}/main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../{workspaces => workspace}/README.md | 2 +- .../{workspaces => workspace}/main.bicep | 0 .../{workspaces => workspace}/main.json | 0 .../{workspaces => workspace}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../.test/private/dependencies.bicep | 0 .../.test/private/main.test.bicep | 0 .../.test/public/dependencies1.bicep | 0 .../.test/public/dependencies2.bicep | 0 .../.test/public/main.test.bicep | 0 .../README.md | 6 +- .../databases/README.md | 0 .../databases/main.bicep | 0 .../databases/main.json | 0 .../databases/version.json | 0 .../firewall-rules/README.md | 0 .../firewall-rules/main.bicep | 0 .../firewall-rules/main.json | 0 .../firewall-rules/version.json | 0 .../main.bicep | 4 +- .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../.test/private/dependencies.bicep | 0 .../.test/private/main.test.bicep | 0 .../.test/public/dependencies.bicep | 0 .../.test/public/main.test.bicep | 0 .../README.md | 6 +- .../configurations/README.md | 0 .../configurations/main.bicep | 0 .../configurations/main.json | 0 .../configurations/version.json | 0 .../databases/README.md | 0 .../databases/main.bicep | 0 .../databases/main.json | 0 .../databases/version.json | 0 .../firewall-rules/README.md | 0 .../firewall-rules/main.bicep | 0 .../firewall-rules/main.json | 0 .../firewall-rules/version.json | 0 .../main.bicep | 6 +- .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../applications/README.md | 0 .../applications/main.bicep | 0 .../applications/main.json | 0 .../applications/version.json | 0 .../main.bicep | 2 +- .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../{host-pools => host-pool}/README.md | 4 +- .../{host-pools => host-pool}/main.bicep | 0 .../{host-pools => host-pool}/main.json | 0 .../{host-pools => host-pool}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../{scaling-plans => scaling-plan}/README.md | 4 +- .../main.bicep | 0 .../{scaling-plans => scaling-plan}/main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../{workspaces => workspace}/README.md | 4 +- .../{workspaces => workspace}/main.bicep | 0 .../{workspaces => workspace}/main.json | 0 .../{workspaces => workspace}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../{labs => lab}/.test/main.test.bicep | 0 .../{labs => lab}/.test/min/main.test.bicep | 0 modules/dev-test-lab/{labs => lab}/README.md | 4 +- .../{labs => lab}/artifactsources/README.md | 0 .../{labs => lab}/artifactsources/main.bicep | 0 .../{labs => lab}/artifactsources/main.json | 0 .../artifactsources/version.json | 0 .../{labs => lab}/costs/README.md | 0 .../{labs => lab}/costs/main.bicep | 0 .../{labs => lab}/costs/main.json | 0 .../{labs => lab}/costs/version.json | 0 modules/dev-test-lab/{labs => lab}/main.bicep | 12 +- modules/dev-test-lab/{labs => lab}/main.json | 0 .../notificationchannels/README.md | 0 .../notificationchannels/main.bicep | 0 .../notificationchannels/main.json | 0 .../notificationchannels/version.json | 0 .../policysets/policies/README.md | 0 .../policysets/policies/main.bicep | 0 .../policysets/policies/main.json | 0 .../policysets/policies/version.json | 0 .../{labs => lab}/schedules/README.md | 0 .../{labs => lab}/schedules/main.bicep | 0 .../{labs => lab}/schedules/main.json | 0 .../{labs => lab}/schedules/version.json | 0 .../dev-test-lab/{labs => lab}/version.json | 0 .../{labs => lab}/virtualnetworks/README.md | 0 .../{labs => lab}/virtualnetworks/main.bicep | 0 .../{labs => lab}/virtualnetworks/main.json | 0 .../virtualnetworks/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../endpoints--event-grid/README.md | 0 .../endpoints--event-grid/main.bicep | 0 .../endpoints--event-grid/main.json | 0 .../endpoints--event-grid/version.json | 0 .../endpoints--event-hub/README.md | 0 .../endpoints--event-hub/main.bicep | 0 .../endpoints--event-hub/main.json | 0 .../endpoints--event-hub/version.json | 0 .../endpoints--service-bus/README.md | 0 .../endpoints--service-bus/main.bicep | 0 .../endpoints--service-bus/main.json | 0 .../endpoints--service-bus/version.json | 0 .../main.bicep | 2 +- .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/gremlindb/dependencies.bicep | 0 .../.test/gremlindb/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/mongodb/dependencies.bicep | 0 .../.test/mongodb/main.test.bicep | 0 .../.test/plain/dependencies.bicep | 0 .../.test/plain/main.test.bicep | 0 .../.test/sqldb/dependencies.bicep | 0 .../.test/sqldb/main.test.bicep | 0 .../README.md | 8 +- .../gremlin-databases/README.md | 0 .../gremlin-databases/graphs/README.md | 0 .../gremlin-databases/graphs/main.bicep | 0 .../gremlin-databases/graphs/main.json | 0 .../gremlin-databases/graphs/version.json | 0 .../gremlin-databases/main.bicep | 2 +- .../gremlin-databases/main.json | 0 .../gremlin-databases/version.json | 0 .../main.bicep | 8 +- .../main.json | 0 .../mongodb-databases/README.md | 0 .../mongodb-databases/collections/README.md | 0 .../mongodb-databases/collections/main.bicep | 0 .../mongodb-databases/collections/main.json | 0 .../collections/version.json | 0 .../mongodb-databases/main.bicep | 2 +- .../mongodb-databases/main.json | 0 .../mongodb-databases/version.json | 0 .../sql-databases/README.md | 0 .../sql-databases/containers/README.md | 0 .../sql-databases/containers/main.bicep | 0 .../sql-databases/containers/main.json | 0 .../sql-databases/containers/version.json | 0 .../sql-databases/main.bicep | 2 +- .../sql-databases/main.json | 0 .../sql-databases/version.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../{domains => domain}/.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../.test/pe/dependencies.bicep | 0 .../.test/pe/main.test.bicep | 0 .../event-grid/{domains => domain}/README.md | 6 +- .../event-grid/{domains => domain}/main.bicep | 4 +- .../event-grid/{domains => domain}/main.json | 0 .../{domains => domain}/topics/README.md | 0 .../{domains => domain}/topics/main.bicep | 0 .../{domains => domain}/topics/main.json | 0 .../{domains => domain}/topics/version.json | 0 .../{domains => domain}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../{system-topics => system-topic}/README.md | 4 +- .../eventSubscriptions/README.md | 0 .../eventSubscriptions/main.bicep | 0 .../eventSubscriptions/main.json | 0 .../eventSubscriptions/version.json | 0 .../main.bicep | 2 +- .../{system-topics => system-topic}/main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../{topics => topic}/.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../.test/pe/dependencies.bicep | 0 .../.test/pe/main.test.bicep | 0 .../event-grid/{topics => topic}/README.md | 6 +- .../eventSubscriptions/README.md | 0 .../eventSubscriptions/main.bicep | 0 .../eventSubscriptions/main.json | 0 .../eventSubscriptions/version.json | 0 .../event-grid/{topics => topic}/main.bicep | 4 +- .../event-grid/{topics => topic}/main.json | 0 .../event-grid/{topics => topic}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/encr/dependencies.bicep | 0 .../.test/encr/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../.test/pe/dependencies.bicep | 0 .../.test/pe/main.test.bicep | 0 .../{namespaces => namespace}/README.md | 8 +- .../authorization-rules/README.md | 0 .../authorization-rules/main.bicep | 0 .../authorization-rules/main.json | 0 .../authorization-rules/version.json | 0 .../disaster-recovery-configs/README.md | 0 .../disaster-recovery-configs/main.bicep | 0 .../disaster-recovery-configs/main.json | 0 .../disaster-recovery-configs/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../eventhubs/README.md | 0 .../eventhubs/authorization-rules/README.md | 0 .../eventhubs/authorization-rules/main.bicep | 0 .../eventhubs/authorization-rules/main.json | 0 .../authorization-rules/version.json | 0 .../eventhubs/consumergroups/README.md | 0 .../eventhubs/consumergroups/main.bicep | 0 .../eventhubs/consumergroups/main.json | 0 .../eventhubs/consumergroups/version.json | 0 .../eventhubs/main.bicep | 4 +- .../eventhubs/main.json | 0 .../eventhubs/version.json | 0 .../{namespaces => namespace}/main.bicep | 10 +- .../{namespaces => namespace}/main.json | 0 .../network-rule-sets/README.md | 0 .../network-rule-sets/main.bicep | 0 .../network-rule-sets/main.json | 0 .../network-rule-sets/version.json | 0 .../{namespaces => namespace}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../{health-bots => health-bot}/README.md | 4 +- .../{health-bots => health-bot}/main.bicep | 0 .../{health-bots => health-bot}/main.json | 0 .../{health-bots => health-bot}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../{workspaces => workspace}/README.md | 4 +- .../dicomservices/README.md | 0 .../dicomservices/main.bicep | 0 .../dicomservices/main.json | 0 .../dicomservices/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../fhirservices/README.md | 0 .../fhirservices/main.bicep | 0 .../fhirservices/main.json | 0 .../fhirservices/version.json | 0 .../iotconnectors/README.md | 0 .../iotconnectors/fhirdestinations/README.md | 0 .../iotconnectors/fhirdestinations/main.bicep | 0 .../iotconnectors/fhirdestinations/main.json | 0 .../fhirdestinations/version.json | 0 .../iotconnectors/main.bicep | 2 +- .../iotconnectors/main.json | 0 .../iotconnectors/version.json | 0 .../{workspaces => workspace}/main.bicep | 6 +- .../{workspaces => workspace}/main.json | 0 .../{workspaces => workspace}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../{action-groups => action-group}/README.md | 4 +- .../main.bicep | 0 .../{action-groups => action-group}/main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../README.md | 2 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../{components => component}/README.md | 4 +- .../{components => component}/main.bicep | 0 .../{components => component}/main.json | 0 .../{components => component}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/customadv/dependencies.bicep | 0 .../.test/customadv/main.test.bicep | 0 .../.test/custombasic/dependencies.bicep | 0 .../.test/custombasic/main.test.bicep | 0 .../.test/customiis/dependencies.bicep | 0 .../.test/customiis/main.test.bicep | 0 .../.test/linux/dependencies.bicep | 0 .../.test/linux/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../.test/windows/dependencies.bicep | 0 .../.test/windows/main.test.bicep | 0 .../README.md | 12 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../README.md | 2 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../{metric-alerts => metric-alert}/README.md | 2 +- .../main.bicep | 0 .../{metric-alerts => metric-alert}/main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 4 +- .../main.json | 0 .../scoped-resources/README.md | 0 .../scoped-resources/main.bicep | 0 .../scoped-resources/main.json | 0 .../scoped-resources/version.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../README.md | 2 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../insights/{webtests => webtest}/README.md | 4 +- .../insights/{webtests => webtest}/main.bicep | 0 .../insights/{webtests => webtest}/main.json | 0 .../{webtests => webtest}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../{vaults => vault}/.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../.test/pe/dependencies.bicep | 0 .../.test/pe/main.test.bicep | 0 modules/key-vault/{vaults => vault}/README.md | 6 +- .../access-policies/README.md | 0 .../access-policies/main.bicep | 0 .../access-policies/main.json | 0 .../access-policies/version.json | 0 .../keys/.bicep/nested_roleAssignments.bicep | 0 .../{vaults => vault}/keys/README.md | 0 .../{vaults => vault}/keys/main.bicep | 0 .../{vaults => vault}/keys/main.json | 0 .../{vaults => vault}/keys/version.json | 0 .../key-vault/{vaults => vault}/main.bicep | 8 +- modules/key-vault/{vaults => vault}/main.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../{vaults => vault}/secrets/README.md | 0 .../{vaults => vault}/secrets/main.bicep | 0 .../{vaults => vault}/secrets/main.json | 0 .../{vaults => vault}/secrets/version.json | 0 .../key-vault/{vaults => vault}/version.json | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../{extensions => extension}/README.md | 4 +- .../{extensions => extension}/main.bicep | 2 +- .../{extensions => extension}/main.json | 0 .../{extensions => extension}/version.json | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../logic/{workflows => workflow}/README.md | 2 +- .../logic/{workflows => workflow}/main.bicep | 0 .../logic/{workflows => workflow}/main.json | 0 .../{workflows => workflow}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/encr/dependencies.bicep | 0 .../.test/encr/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../{workspaces => workspace}/README.md | 6 +- .../computes/README.md | 0 .../computes/main.bicep | 0 .../computes/main.json | 0 .../computes/version.json | 0 .../{workspaces => workspace}/main.bicep | 4 +- .../{workspaces => workspace}/main.json | 0 .../{workspaces => workspace}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../README.md | 2 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../nested_registrationAssignment.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/rg/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../.test/nfs3/dependencies.bicep | 0 .../.test/nfs3/main.test.bicep | 0 .../.test/nfs41/dependencies.bicep | 0 .../.test/nfs41/main.test.bicep | 0 .../README.md | 6 +- .../.bicep/nested_roleAssignments.bicep | 0 .../capacity-pools/README.md | 0 .../capacity-pools/main.bicep | 2 +- .../capacity-pools/main.json | 0 .../capacity-pools/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../capacity-pools/volumes/README.md | 0 .../capacity-pools/volumes/main.bicep | 0 .../capacity-pools/volumes/main.json | 0 .../capacity-pools/volumes/version.json | 0 .../main.bicep | 2 +- .../main.json | 0 .../version.json | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../README.md | 2 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../README.md | 2 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../README.md | 2 +- .../main.bicep | 0 .../main.json | 0 .../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/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 12 +- .../main.bicep | 2 +- .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.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/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../{bastion-hosts => bastion-host}/README.md | 6 +- .../main.bicep | 2 +- .../{bastion-hosts => bastion-host}/main.json | 0 .../version.json | 0 .../.test/main.test.bicep | 0 .../.test/vnet2vnet/dependencies.bicep | 0 .../.test/vnet2vnet/main.test.bicep | 0 .../{connections => connection}/README.md | 2 +- .../{connections => connection}/main.bicep | 0 .../{connections => connection}/main.json | 0 .../{connections => connection}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../forwarding-rules/README.md | 0 .../forwarding-rules/main.bicep | 0 .../forwarding-rules/main.json | 0 .../forwarding-rules/version.json | 0 .../main.bicep | 4 +- .../main.json | 0 .../version.json | 0 .../virtual-network-links/README.md | 0 .../virtual-network-links/main.bicep | 0 .../virtual-network-links/main.json | 0 .../virtual-network-links/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../{dns-resolvers => dns-resolver}/README.md | 2 +- .../main.bicep | 0 .../{dns-resolvers => dns-resolver}/main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../network/{dns-zones => dns-zone}/README.md | 4 +- .../a/.bicep/nested_roleAssignments.bicep | 0 .../{dns-zones => dns-zone}/a/README.md | 0 .../{dns-zones => dns-zone}/a/main.bicep | 0 .../{dns-zones => dns-zone}/a/main.json | 0 .../{dns-zones => dns-zone}/a/version.json | 0 .../aaaa/.bicep/nested_roleAssignments.bicep | 0 .../{dns-zones => dns-zone}/aaaa/README.md | 0 .../{dns-zones => dns-zone}/aaaa/main.bicep | 0 .../{dns-zones => dns-zone}/aaaa/main.json | 0 .../{dns-zones => dns-zone}/aaaa/version.json | 0 .../caa/.bicep/nested_roleAssignments.bicep | 0 .../{dns-zones => dns-zone}/caa/README.md | 0 .../{dns-zones => dns-zone}/caa/main.bicep | 0 .../{dns-zones => dns-zone}/caa/main.json | 0 .../{dns-zones => dns-zone}/caa/version.json | 0 .../cname/.bicep/nested_roleAssignments.bicep | 0 .../{dns-zones => dns-zone}/cname/README.md | 0 .../{dns-zones => dns-zone}/cname/main.bicep | 0 .../{dns-zones => dns-zone}/cname/main.json | 0 .../cname/version.json | 0 .../{dns-zones => dns-zone}/main.bicep | 0 .../network/{dns-zones => dns-zone}/main.json | 0 .../mx/.bicep/nested_roleAssignments.bicep | 0 .../{dns-zones => dns-zone}/mx/README.md | 0 .../{dns-zones => dns-zone}/mx/main.bicep | 0 .../{dns-zones => dns-zone}/mx/main.json | 0 .../{dns-zones => dns-zone}/mx/version.json | 0 .../ns/.bicep/nested_roleAssignments.bicep | 0 .../{dns-zones => dns-zone}/ns/README.md | 0 .../{dns-zones => dns-zone}/ns/main.bicep | 0 .../{dns-zones => dns-zone}/ns/main.json | 0 .../{dns-zones => dns-zone}/ns/version.json | 0 .../ptr/.bicep/nested_roleAssignments.bicep | 0 .../{dns-zones => dns-zone}/ptr/README.md | 0 .../{dns-zones => dns-zone}/ptr/main.bicep | 0 .../{dns-zones => dns-zone}/ptr/main.json | 0 .../{dns-zones => dns-zone}/ptr/version.json | 0 .../soa/.bicep/nested_roleAssignments.bicep | 0 .../{dns-zones => dns-zone}/soa/README.md | 0 .../{dns-zones => dns-zone}/soa/main.bicep | 0 .../{dns-zones => dns-zone}/soa/main.json | 0 .../{dns-zones => dns-zone}/soa/version.json | 0 .../srv/.bicep/nested_roleAssignments.bicep | 0 .../{dns-zones => dns-zone}/srv/README.md | 0 .../{dns-zones => dns-zone}/srv/main.bicep | 0 .../{dns-zones => dns-zone}/srv/main.json | 0 .../{dns-zones => dns-zone}/srv/version.json | 0 .../txt/.bicep/nested_roleAssignments.bicep | 0 .../{dns-zones => dns-zone}/txt/README.md | 0 .../{dns-zones => dns-zone}/txt/main.bicep | 0 .../{dns-zones => dns-zone}/txt/main.json | 0 .../{dns-zones => dns-zone}/txt/version.json | 0 .../{dns-zones => dns-zone}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 2 +- .../main.json | 0 .../rule-collection-groups/README.md | 0 .../rule-collection-groups/main.bicep | 0 .../rule-collection-groups/main.json | 0 .../rule-collection-groups/version.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../{front-doors => front-door}/README.md | 4 +- .../{front-doors => front-door}/main.bicep | 0 .../{front-doors => front-door}/main.json | 0 .../{front-doors => front-door}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../network/{ip-groups => ip-group}/README.md | 4 +- .../{ip-groups => ip-group}/main.bicep | 0 .../network/{ip-groups => ip-group}/main.json | 0 .../{ip-groups => ip-group}/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/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 6 +- .../backend-address-pools/README.md | 0 .../backend-address-pools/main.bicep | 0 .../backend-address-pools/main.json | 0 .../backend-address-pools/version.json | 0 .../inbound-nat-rules/README.md | 0 .../inbound-nat-rules/main.bicep | 0 .../inbound-nat-rules/main.json | 0 .../inbound-nat-rules/version.json | 0 .../main.bicep | 4 +- .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../{nat-gateways => nat-gateway}/README.md | 2 +- .../{nat-gateways => nat-gateway}/main.bicep | 2 +- .../{nat-gateways => nat-gateway}/main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../README.md | 2 +- .../connectivity-configurations/README.md | 0 .../connectivity-configurations/main.bicep | 0 .../connectivity-configurations/main.json | 0 .../connectivity-configurations/version.json | 0 .../main.bicep | 8 +- .../main.json | 0 .../network-groups/README.md | 0 .../network-groups/main.bicep | 2 +- .../network-groups/main.json | 0 .../network-groups/static-members/README.md | 0 .../network-groups/static-members/main.bicep | 0 .../network-groups/static-members/main.json | 0 .../static-members/version.json | 0 .../network-groups/version.json | 0 .../scope-connections/README.md | 0 .../scope-connections/main.bicep | 0 .../scope-connections/main.json | 0 .../scope-connections/version.json | 0 .../security-admin-configurations/README.md | 0 .../security-admin-configurations/main.bicep | 2 +- .../security-admin-configurations/main.json | 0 .../rule-collections/README.md | 0 .../rule-collections/main.bicep | 2 +- .../rule-collections/main.json | 0 .../rule-collections/rules/README.md | 0 .../rule-collections/rules/main.bicep | 0 .../rule-collections/rules/main.json | 0 .../rule-collections/rules/version.json | 0 .../rule-collections/version.json | 0 .../version.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 2 +- .../main.json | 0 .../security-rules/README.md | 0 .../security-rules/main.bicep | 0 .../security-rules/main.json | 0 .../security-rules/version.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../connection-monitors/README.md | 0 .../connection-monitors/main.bicep | 0 .../connection-monitors/main.json | 0 .../connection-monitors/version.json | 0 .../flow-logs/README.md | 0 .../flow-logs/main.bicep | 0 .../flow-logs/main.json | 0 .../flow-logs/version.json | 0 .../main.bicep | 4 +- .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../a/.bicep/nested_roleAssignments.bicep | 0 .../a/README.md | 0 .../a/main.bicep | 0 .../a/main.json | 0 .../a/version.json | 0 .../aaaa/.bicep/nested_roleAssignments.bicep | 0 .../aaaa/README.md | 0 .../aaaa/main.bicep | 0 .../aaaa/main.json | 0 .../aaaa/version.json | 0 .../cname/.bicep/nested_roleAssignments.bicep | 0 .../cname/README.md | 0 .../cname/main.bicep | 0 .../cname/main.json | 0 .../cname/version.json | 0 .../main.bicep | 2 +- .../main.json | 0 .../mx/.bicep/nested_roleAssignments.bicep | 0 .../mx/README.md | 0 .../mx/main.bicep | 0 .../mx/main.json | 0 .../mx/version.json | 0 .../ptr/.bicep/nested_roleAssignments.bicep | 0 .../ptr/README.md | 0 .../ptr/main.bicep | 0 .../ptr/main.json | 0 .../ptr/version.json | 0 .../soa/.bicep/nested_roleAssignments.bicep | 0 .../soa/README.md | 0 .../soa/main.bicep | 0 .../soa/main.json | 0 .../soa/version.json | 0 .../srv/.bicep/nested_roleAssignments.bicep | 0 .../srv/README.md | 0 .../srv/main.bicep | 0 .../srv/main.json | 0 .../srv/version.json | 0 .../txt/.bicep/nested_roleAssignments.bicep | 0 .../txt/README.md | 0 .../txt/main.bicep | 0 .../txt/main.json | 0 .../txt/version.json | 0 .../version.json | 0 .../virtual-network-links/README.md | 0 .../virtual-network-links/main.bicep | 0 .../virtual-network-links/main.json | 0 .../virtual-network-links/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 2 +- .../main.json | 0 .../private-dns-zone-groups/README.md | 0 .../private-dns-zone-groups/main.bicep | 0 .../private-dns-zone-groups/main.json | 0 .../private-dns-zone-groups/version.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../{route-tables => route-table}/README.md | 4 +- .../{route-tables => route-table}/main.bicep | 0 .../{route-tables => route-table}/main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../{virtual-hubs => virtual-hub}/README.md | 4 +- .../hub-route-tables/README.md | 0 .../hub-route-tables/main.bicep | 0 .../hub-route-tables/main.json | 0 .../hub-route-tables/version.json | 0 .../hub-virtual-network-connections/README.md | 0 .../main.bicep | 0 .../hub-virtual-network-connections/main.json | 0 .../version.json | 0 .../{virtual-hubs => virtual-hub}/main.bicep | 4 +- .../{virtual-hubs => virtual-hub}/main.json | 0 .../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/main.test.bicep | 0 .../.test/vpn/dependencies.bicep | 0 .../.test/vpn/main.test.bicep | 0 .../README.md | 6 +- .../main.bicep | 4 +- .../main.json | 0 .../nat-rules/README.md | 0 .../nat-rules/main.bicep | 0 .../nat-rules/main.json | 0 .../nat-rules/version.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../.test/vnetPeering/dependencies.bicep | 0 .../.test/vnetPeering/main.test.bicep | 0 .../README.md | 6 +- .../main.bicep | 6 +- .../main.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../subnets/README.md | 0 .../subnets/main.bicep | 0 .../subnets/main.json | 0 .../subnets/version.json | 0 .../version.json | 0 .../virtual-network-peerings/README.md | 0 .../virtual-network-peerings/main.bicep | 0 .../virtual-network-peerings/main.json | 0 .../virtual-network-peerings/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../{virtual-wans => virtual-wan}/README.md | 4 +- .../{virtual-wans => virtual-wan}/main.bicep | 0 .../{virtual-wans => virtual-wan}/main.json | 0 .../version.json | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../{vpn-gateways => vpn-gateway}/README.md | 4 +- .../{vpn-gateways => vpn-gateway}/main.bicep | 2 +- .../{vpn-gateways => vpn-gateway}/main.json | 0 .../nat-rules/README.md | 0 .../nat-rules/main.bicep | 0 .../nat-rules/main.json | 0 .../nat-rules/version.json | 0 .../version.json | 0 .../vpn-connections/README.md | 0 .../vpn-connections/main.bicep | 0 .../vpn-connections/main.json | 0 .../vpn-connections/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../network/{vpn-sites => vpn-site}/README.md | 4 +- .../{vpn-sites => vpn-site}/main.bicep | 0 .../network/{vpn-sites => vpn-site}/main.json | 0 .../{vpn-sites => vpn-site}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/adv/dependencies.bicep | 0 .../.test/adv/main.test.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../{workspaces => workspace}/README.md | 6 +- .../data-exports/README.md | 0 .../data-exports/main.bicep | 0 .../data-exports/main.json | 0 .../data-exports/version.json | 0 .../data-sources/README.md | 0 .../data-sources/main.bicep | 0 .../data-sources/main.json | 0 .../data-sources/version.json | 0 .../linked-services/README.md | 0 .../linked-services/main.bicep | 0 .../linked-services/main.json | 0 .../linked-services/version.json | 0 .../linked-storage-accounts/README.md | 0 .../linked-storage-accounts/main.bicep | 0 .../linked-storage-accounts/main.json | 0 .../linked-storage-accounts/version.json | 0 .../{workspaces => workspace}/main.bicep | 16 +- .../{workspaces => workspace}/main.json | 0 .../saved-searches/README.md | 0 .../saved-searches/main.bicep | 0 .../saved-searches/main.json | 0 .../saved-searches/version.json | 0 .../storage-insight-configs/README.md | 0 .../storage-insight-configs/main.bicep | 0 .../storage-insight-configs/main.json | 0 .../storage-insight-configs/version.json | 0 .../tables/README.md | 0 .../tables/main.bicep | 0 .../tables/main.json | 0 .../tables/version.json | 0 .../{workspaces => workspace}/version.json | 0 .../.test/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../.test/ms/dependencies.bicep | 0 .../.test/ms/main.test.bicep | 0 .../.test/nonms/dependencies.bicep | 0 .../.test/nonms/main.test.bicep | 0 .../{solutions => solution}/README.md | 6 +- .../{solutions => solution}/main.bicep | 0 .../{solutions => solution}/main.json | 0 .../{solutions => solution}/version.json | 0 .../.test/main.test.bicep | 0 .../.test/mg.common/main.test.bicep | 0 .../.test/mg.min/main.test.bicep | 0 .../.test/rg.common/main.test.bicep | 0 .../.test/rg.min/main.test.bicep | 0 .../.test/sub.common/main.test.bicep | 0 .../.test/sub.min/main.test.bicep | 0 .../{remediations => remediation}/README.md | 14 +- .../{remediations => remediation}/main.bicep | 0 .../{remediations => remediation}/main.json | 0 .../management-group/README.md | 0 .../management-group/main.bicep | 0 .../management-group/main.json | 0 .../management-group/version.json | 0 .../resource-group/README.md | 0 .../resource-group/main.bicep | 0 .../resource-group/main.json | 0 .../resource-group/version.json | 0 .../subscription/README.md | 0 .../subscription/main.bicep | 0 .../subscription/main.json | 0 .../subscription/version.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../{capacities => capacity}/README.md | 4 +- .../{capacities => capacity}/main.bicep | 0 .../{capacities => capacity}/main.json | 0 .../{capacities => capacity}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../purview/{accounts => account}/README.md | 4 +- .../purview/{accounts => account}/main.bicep | 10 +- .../purview/{accounts => account}/main.json | 0 .../{accounts => account}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/dr/main.test.bicep | 0 .../{vaults => vault}/.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../{vaults => vault}/README.md | 6 +- .../{vaults => vault}/backup-config/README.md | 0 .../backup-config/main.bicep | 0 .../{vaults => vault}/backup-config/main.json | 0 .../backup-config/version.json | 0 .../protection-containers/README.md | 0 .../protection-containers/main.bicep | 2 +- .../protection-containers/main.json | 0 .../protected-items/README.md | 0 .../protected-items/main.bicep | 0 .../protected-items/main.json | 0 .../protected-items/version.json | 0 .../protection-containers/version.json | 0 .../backup-policies/README.md | 0 .../backup-policies/main.bicep | 0 .../backup-policies/main.json | 0 .../backup-policies/version.json | 0 .../backup-storage-config/README.md | 0 .../backup-storage-config/main.bicep | 0 .../backup-storage-config/main.json | 0 .../backup-storage-config/version.json | 0 .../{vaults => vault}/main.bicep | 12 +- .../{vaults => vault}/main.json | 0 .../replication-alert-settings/README.md | 0 .../replication-alert-settings/main.bicep | 0 .../replication-alert-settings/main.json | 0 .../replication-alert-settings/version.json | 0 .../replication-fabrics/README.md | 0 .../replication-fabrics/main.bicep | 2 +- .../replication-fabrics/main.json | 0 .../README.md | 0 .../main.bicep | 2 +- .../main.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../version.json | 0 .../replication-fabrics/version.json | 0 .../replication-policies/README.md | 0 .../replication-policies/main.bicep | 0 .../replication-policies/main.json | 0 .../replication-policies/version.json | 0 .../{vaults => vault}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../.test/pe/dependencies.bicep | 0 .../.test/pe/main.test.bicep | 0 .../relay/{namespaces => namespace}/README.md | 6 +- .../authorization-rules/README.md | 0 .../authorization-rules/main.bicep | 0 .../authorization-rules/main.json | 0 .../authorization-rules/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../hybrid-connections/README.md | 0 .../authorization-rules/README.md | 0 .../authorization-rules/main.bicep | 0 .../authorization-rules/main.json | 0 .../authorization-rules/version.json | 0 .../hybrid-connections/main.bicep | 2 +- .../hybrid-connections/main.json | 0 .../hybrid-connections/version.json | 0 .../{namespaces => namespace}/main.bicep | 10 +- .../relay/{namespaces => namespace}/main.json | 0 .../network-rule-sets/README.md | 0 .../network-rule-sets/main.bicep | 0 .../network-rule-sets/main.json | 0 .../network-rule-sets/version.json | 0 .../{namespaces => namespace}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../wcf-relays/README.md | 0 .../wcf-relays/authorization-rules/README.md | 0 .../wcf-relays/authorization-rules/main.bicep | 0 .../wcf-relays/authorization-rules/main.json | 0 .../authorization-rules/version.json | 0 .../wcf-relays/main.bicep | 2 +- .../wcf-relays/main.json | 0 .../wcf-relays/version.json | 0 .../.test/cli/dependencies.bicep | 0 .../.test/cli/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/ps/dependencies.bicep | 0 .../.test/ps/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 2 +- .../main.json | 0 .../version.json | 0 modules/resources/tags/main.bicep | 4 +- .../.bicep/readTags.bicep | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/readTags.bicep | 0 .../{subscriptions => subscription}/README.md | 0 .../main.bicep | 0 .../{subscriptions => subscription}/main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/encr/dependencies.bicep | 0 .../.test/encr/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../.test/pe/dependencies.bicep | 0 .../.test/pe/main.test.bicep | 0 .../{namespaces => namespace}/README.md | 8 +- .../authorization-rules/README.md | 0 .../authorization-rules/main.bicep | 0 .../authorization-rules/main.json | 0 .../authorization-rules/version.json | 0 .../disaster-recovery-configs/README.md | 0 .../disaster-recovery-configs/main.bicep | 0 .../disaster-recovery-configs/main.json | 0 .../disaster-recovery-configs/version.json | 0 .../{namespaces => namespace}/main.bicep | 14 +- .../{namespaces => namespace}/main.json | 0 .../migration-configurations/README.md | 0 .../migration-configurations/main.bicep | 0 .../migration-configurations/main.json | 0 .../migration-configurations/version.json | 0 .../network-rule-sets/README.md | 0 .../network-rule-sets/main.bicep | 0 .../network-rule-sets/main.json | 0 .../network-rule-sets/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../queues/README.md | 0 .../queues/authorization-rules/README.md | 0 .../queues/authorization-rules/main.bicep | 0 .../queues/authorization-rules/main.json | 0 .../queues/authorization-rules/version.json | 0 .../queues/main.bicep | 2 +- .../queues/main.json | 0 .../queues/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../topics/README.md | 0 .../topics/authorization-rules/README.md | 0 .../topics/authorization-rules/main.bicep | 0 .../topics/authorization-rules/main.json | 0 .../topics/authorization-rules/version.json | 0 .../topics/main.bicep | 2 +- .../topics/main.json | 0 .../topics/version.json | 0 .../{namespaces => namespace}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/cert/main.test.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../{clusters => cluster}/README.md | 6 +- .../application-types/README.md | 0 .../application-types/main.bicep | 0 .../application-types/main.json | 0 .../application-types/version.json | 0 .../{clusters => cluster}/main.bicep | 2 +- .../{clusters => cluster}/main.json | 0 .../{clusters => cluster}/version.json | 0 modules/signal-r-service/signal-r/main.bicep | 2 +- .../signal-r-service/web-pub-sub/main.bicep | 2 +- .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../administrators/README.md | 0 .../administrators/main.bicep | 0 .../administrators/main.json | 0 .../administrators/version.json | 0 .../databases/README.md | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../databases/main.bicep | 4 +- .../databases/main.json | 0 .../databases/version.json | 0 .../encryption-protector/README.md | 0 .../encryption-protector/main.bicep | 0 .../encryption-protector/main.json | 0 .../encryption-protector/version.json | 0 .../keys/README.md | 0 .../keys/main.bicep | 0 .../keys/main.json | 0 .../keys/version.json | 0 .../main.bicep | 10 +- .../main.json | 0 .../security-alert-policies/README.md | 0 .../security-alert-policies/main.bicep | 0 .../security-alert-policies/main.json | 0 .../security-alert-policies/version.json | 0 .../version.json | 0 .../vulnerability-assessments/README.md | 0 .../vulnerability-assessments/main.bicep | 0 .../vulnerability-assessments/main.json | 0 .../vulnerability-assessments/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/admin/dependencies.bicep | 0 .../.test/admin/main.test.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../{servers => server}/.test/main.test.bicep | 0 .../.test/pe/dependencies.bicep | 0 .../.test/pe/main.test.bicep | 0 .../.test/secondary/dependencies.bicep | 0 .../.test/secondary/main.test.bicep | 0 modules/sql/{servers => server}/README.md | 8 +- .../{servers => server}/databases/README.md | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../{servers => server}/databases/main.bicep | 4 +- .../{servers => server}/databases/main.json | 0 .../databases/version.json | 0 .../elastic-pools/README.md | 0 .../elastic-pools/main.bicep | 0 .../elastic-pools/main.json | 0 .../elastic-pools/version.json | 0 .../encryption-protector/README.md | 0 .../encryption-protector/main.bicep | 0 .../encryption-protector/main.json | 0 .../encryption-protector/version.json | 0 .../firewall-rules/README.md | 0 .../firewall-rules/main.bicep | 0 .../firewall-rules/main.json | 0 .../firewall-rules/version.json | 0 .../sql/{servers => server}/keys/README.md | 0 .../sql/{servers => server}/keys/main.bicep | 0 .../sql/{servers => server}/keys/main.json | 0 .../sql/{servers => server}/keys/version.json | 0 modules/sql/{servers => server}/main.bicep | 16 +- modules/sql/{servers => server}/main.json | 0 .../security-alert-policies/README.md | 0 .../security-alert-policies/main.bicep | 0 .../security-alert-policies/main.json | 0 .../security-alert-policies/version.json | 0 modules/sql/{servers => server}/version.json | 0 .../virtual-network-rules/README.md | 0 .../virtual-network-rules/main.bicep | 0 .../virtual-network-rules/main.json | 0 .../virtual-network-rules/version.json | 0 .../vulnerability-assessments/README.md | 0 .../vulnerability-assessments/main.bicep | 0 .../vulnerability-assessments/main.json | 0 .../vulnerability-assessments/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/encr/dependencies.bicep | 0 .../.test/encr/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../.test/nfs/dependencies.bicep | 0 .../.test/nfs/main.test.bicep | 0 .../.test/v1/main.test.bicep | 0 .../README.md | 10 +- .../blob-services/README.md | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../blob-services/containers/README.md | 0 .../immutability-policies/README.md | 0 .../immutability-policies/main.bicep | 0 .../immutability-policies/main.json | 0 .../immutability-policies/version.json | 0 .../blob-services/containers/main.bicep | 2 +- .../blob-services/containers/main.json | 0 .../blob-services/containers/version.json | 0 .../blob-services/main.bicep | 2 +- .../blob-services/main.json | 0 .../blob-services/version.json | 0 .../file-services/README.md | 0 .../file-services/main.bicep | 2 +- .../file-services/main.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../file-services/shares/README.md | 0 .../file-services/shares/main.bicep | 0 .../file-services/shares/main.json | 0 .../file-services/shares/version.json | 0 .../file-services/version.json | 0 .../local-users/README.md | 0 .../local-users/main.bicep | 0 .../local-users/main.json | 0 .../local-users/version.json | 0 .../main.bicep | 14 +- .../main.json | 0 .../management-policies/README.md | 0 .../management-policies/main.bicep | 0 .../management-policies/main.json | 0 .../management-policies/version.json | 0 .../queue-services/README.md | 0 .../queue-services/main.bicep | 2 +- .../queue-services/main.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../queue-services/queues/README.md | 0 .../queue-services/queues/main.bicep | 0 .../queue-services/queues/main.json | 0 .../queue-services/queues/version.json | 0 .../queue-services/version.json | 0 .../table-services/README.md | 0 .../table-services/main.bicep | 2 +- .../table-services/main.json | 0 .../table-services/tables/README.md | 0 .../table-services/tables/main.bicep | 0 .../table-services/tables/main.json | 0 .../table-services/tables/version.json | 0 .../table-services/version.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 2 +- .../main.json | 0 .../version.json | 0 .../.bicep/nested_cmkRbac.bicep | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/encrwsai/dependencies.bicep | 0 .../.test/encrwsai/main.test.bicep | 0 .../.test/encrwuai/dependencies.bicep | 0 .../.test/encrwuai/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/managedvnet/dependencies.bicep | 0 .../.test/managedvnet/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../{workspaces => workspace}/README.md | 10 +- .../integration-runtimes/README.md | 0 .../integration-runtimes/main.bicep | 0 .../integration-runtimes/main.json | 0 .../integration-runtimes/version.json | 0 .../{workspaces => workspace}/keys/README.md | 0 .../{workspaces => workspace}/keys/main.bicep | 0 .../{workspaces => workspace}/keys/main.json | 0 .../keys/version.json | 0 .../{workspaces => workspace}/main.bicep | 6 +- .../{workspaces => workspace}/main.json | 0 .../{workspaces => workspace}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/dependencies.bicep | 0 .../.test/min/main.test.bicep | 0 .../README.md | 4 +- .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../web/{connections => connection}/README.md | 2 +- .../{connections => connection}/main.bicep | 0 .../web/{connections => connection}/main.json | 0 .../{connections => connection}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/asev2/dependencies.bicep | 0 .../.test/asev2/main.test.bicep | 0 .../.test/asev3/dependencies.bicep | 0 .../.test/asev3/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../README.md | 4 +- .../configurations--customdnssuffix/README.md | 0 .../main.bicep | 0 .../configurations--customdnssuffix/main.json | 0 .../version.json | 0 .../configurations--networking/README.md | 0 .../configurations--networking/main.bicep | 0 .../configurations--networking/main.json | 0 .../configurations--networking/version.json | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../web/{serverfarms => serverfarm}/README.md | 2 +- .../{serverfarms => serverfarm}/main.bicep | 0 .../web/{serverfarms => serverfarm}/main.json | 0 .../{serverfarms => serverfarm}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../functionAppCommon/dependencies.bicep | 0 .../.test/functionAppCommon/main.test.bicep | 0 .../.test/functionAppMin/dependencies.bicep | 0 .../.test/functionAppMin/main.test.bicep | 0 .../web/{sites => site}/.test/main.test.bicep | 0 .../.test/webAppCommon/dependencies.bicep | 0 .../.test/webAppCommon/main.test.bicep | 0 .../.test/webAppMin/dependencies.bicep | 0 .../.test/webAppMin/main.test.bicep | 0 modules/web/{sites => site}/README.md | 8 +- .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../config--appsettings/README.md | 0 .../config--appsettings/main.bicep | 0 .../config--appsettings/main.json | 0 .../config--appsettings/version.json | 0 .../config--authsettingsv2/README.md | 0 .../config--authsettingsv2/main.bicep | 0 .../config--authsettingsv2/main.json | 0 .../config--authsettingsv2/version.json | 0 .../relays/README.md | 0 .../relays/main.bicep | 0 .../relays/main.json | 0 .../relays/version.json | 0 modules/web/{sites => site}/main.bicep | 10 +- modules/web/{sites => site}/main.json | 0 .../slots/.bicep/nested_roleAssignments.bicep | 0 modules/web/{sites => site}/slots/README.md | 0 .../slots/config--appsettings/README.md | 0 .../slots/config--appsettings/main.bicep | 0 .../slots/config--appsettings/main.json | 0 .../slots/config--appsettings/version.json | 0 .../slots/config--authsettingsv2/README.md | 0 .../slots/config--authsettingsv2/main.bicep | 0 .../slots/config--authsettingsv2/main.json | 0 .../slots/config--authsettingsv2/version.json | 0 .../relays/README.md | 0 .../relays/main.bicep | 0 .../relays/main.json | 0 .../relays/version.json | 0 modules/web/{sites => site}/slots/main.bicep | 6 +- modules/web/{sites => site}/slots/main.json | 0 .../web/{sites => site}/slots/version.json | 0 modules/web/{sites => site}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../{static-sites => static-site}/README.md | 4 +- .../config/README.md | 0 .../config/main.bicep | 0 .../config/main.json | 0 .../config/version.json | 0 .../custom-domains/README.md | 0 .../custom-domains/main.bicep | 0 .../custom-domains/main.json | 0 .../custom-domains/version.json | 0 .../linked-backends/README.md | 0 .../linked-backends/main.bicep | 0 .../linked-backends/main.json | 0 .../linked-backends/version.json | 0 .../{static-sites => static-site}/main.bicep | 6 +- .../{static-sites => static-site}/main.json | 0 .../version.json | 0 rtMapping.jsonc | 2 + 2152 files changed, 971 insertions(+), 549 deletions(-) create mode 100644 Set-CARMLFoldersForPBRSingular.ps1 rename modules/aad/{domain-services => domain-service}/.bicep/nested_roleAssignments.bicep (100%) rename modules/aad/{domain-services => domain-service}/.test/common/dependencies.bicep (100%) rename modules/aad/{domain-services => domain-service}/.test/common/main.test.bicep (100%) rename modules/aad/{domain-services => domain-service}/.test/main.test.bicep (100%) rename modules/aad/{domain-services => domain-service}/README.md (99%) rename modules/aad/{domain-services => domain-service}/main.bicep (100%) rename modules/aad/{domain-services => domain-service}/main.json (100%) rename modules/aad/{domain-services => domain-service}/version.json (100%) rename modules/analysis-services/{servers => server}/.bicep/nested_roleAssignments.bicep (100%) rename modules/analysis-services/{servers => server}/.test/common/dependencies.bicep (100%) rename modules/analysis-services/{servers => server}/.test/common/main.test.bicep (100%) rename modules/analysis-services/{servers => server}/.test/main.test.bicep (100%) rename modules/analysis-services/{servers => server}/.test/max/dependencies.bicep (100%) rename modules/analysis-services/{servers => server}/.test/max/main.test.bicep (100%) rename modules/analysis-services/{servers => server}/.test/min/main.test.bicep (100%) rename modules/analysis-services/{servers => server}/README.md (98%) rename modules/analysis-services/{servers => server}/main.bicep (100%) rename modules/analysis-services/{servers => server}/main.json (100%) rename modules/analysis-services/{servers => server}/version.json (100%) rename modules/api-management/service/{api-version-sets => api-version-set}/README.md (100%) rename modules/api-management/service/{api-version-sets => api-version-set}/main.bicep (100%) rename modules/api-management/service/{api-version-sets => api-version-set}/main.json (100%) rename modules/api-management/service/{api-version-sets => api-version-set}/version.json (100%) rename modules/api-management/service/{apis => api}/README.md (100%) rename modules/api-management/service/{apis => api}/main.bicep (98%) rename modules/api-management/service/{apis => api}/main.json (100%) rename modules/api-management/service/{apis => api}/policies/README.md (100%) rename modules/api-management/service/{apis => api}/policies/main.bicep (100%) rename modules/api-management/service/{apis => api}/policies/main.json (100%) rename modules/api-management/service/{apis => api}/policies/version.json (100%) rename modules/api-management/service/{apis => api}/version.json (100%) rename modules/api-management/service/{authorization-servers => authorization-server}/README.md (100%) rename modules/api-management/service/{authorization-servers => authorization-server}/main.bicep (100%) rename modules/api-management/service/{authorization-servers => authorization-server}/main.json (100%) rename modules/api-management/service/{authorization-servers => authorization-server}/version.json (100%) rename modules/api-management/service/{backends => backend}/README.md (100%) rename modules/api-management/service/{backends => backend}/main.bicep (100%) rename modules/api-management/service/{backends => backend}/main.json (100%) rename modules/api-management/service/{backends => backend}/version.json (100%) rename modules/api-management/service/{caches => cache}/README.md (100%) rename modules/api-management/service/{caches => cache}/main.bicep (100%) rename modules/api-management/service/{caches => cache}/main.json (100%) rename modules/api-management/service/{caches => cache}/version.json (100%) rename modules/api-management/service/{identity-providers => identity-provider}/README.md (100%) rename modules/api-management/service/{identity-providers => identity-provider}/main.bicep (100%) rename modules/api-management/service/{identity-providers => identity-provider}/main.json (100%) rename modules/api-management/service/{identity-providers => identity-provider}/version.json (100%) rename modules/api-management/service/{named-values => named-value}/README.md (100%) rename modules/api-management/service/{named-values => named-value}/main.bicep (100%) rename modules/api-management/service/{named-values => named-value}/main.json (100%) rename modules/api-management/service/{named-values => named-value}/version.json (100%) rename modules/api-management/service/{policies => policy}/README.md (100%) rename modules/api-management/service/{policies => policy}/main.bicep (100%) rename modules/api-management/service/{policies => policy}/main.json (100%) rename modules/api-management/service/{policies => policy}/version.json (100%) rename modules/api-management/service/{portalsettings => portalsetting}/README.md (100%) rename modules/api-management/service/{portalsettings => portalsetting}/main.bicep (100%) rename modules/api-management/service/{portalsettings => portalsetting}/main.json (100%) rename modules/api-management/service/{portalsettings => portalsetting}/version.json (100%) rename modules/api-management/service/{products => product}/README.md (100%) rename modules/api-management/service/{products => product}/apis/README.md (100%) rename modules/api-management/service/{products => product}/apis/main.bicep (100%) rename modules/api-management/service/{products => product}/apis/main.json (100%) rename modules/api-management/service/{products => product}/apis/version.json (100%) rename modules/api-management/service/{products => product}/groups/README.md (100%) rename modules/api-management/service/{products => product}/groups/main.bicep (100%) rename modules/api-management/service/{products => product}/groups/main.json (100%) rename modules/api-management/service/{products => product}/groups/version.json (100%) rename modules/api-management/service/{products => product}/main.bicep (97%) rename modules/api-management/service/{products => product}/main.json (100%) rename modules/api-management/service/{products => product}/version.json (100%) rename modules/api-management/service/{subscriptions => subscription}/README.md (100%) rename modules/api-management/service/{subscriptions => subscription}/main.bicep (100%) rename modules/api-management/service/{subscriptions => subscription}/main.json (100%) rename modules/api-management/service/{subscriptions => subscription}/version.json (100%) rename modules/app-configuration/{configuration-stores => configuration-store}/.bicep/nested_roleAssignments.bicep (100%) rename modules/app-configuration/{configuration-stores => configuration-store}/.test/common/dependencies.bicep (100%) rename modules/app-configuration/{configuration-stores => configuration-store}/.test/common/main.test.bicep (100%) rename modules/app-configuration/{configuration-stores => configuration-store}/.test/main.test.bicep (100%) rename modules/app-configuration/{configuration-stores => configuration-store}/.test/min/main.test.bicep (100%) rename modules/app-configuration/{configuration-stores => configuration-store}/.test/pe/dependencies.bicep (100%) rename modules/app-configuration/{configuration-stores => configuration-store}/.test/pe/main.test.bicep (100%) rename modules/app-configuration/{configuration-stores => configuration-store}/README.md (99%) rename modules/app-configuration/{configuration-stores => configuration-store}/key-values/.bicep/nested_roleAssignments.bicep (100%) rename modules/app-configuration/{configuration-stores => configuration-store}/key-values/README.md (100%) rename modules/app-configuration/{configuration-stores => configuration-store}/key-values/main.bicep (100%) rename modules/app-configuration/{configuration-stores => configuration-store}/key-values/main.json (100%) rename modules/app-configuration/{configuration-stores => configuration-store}/key-values/version.json (100%) rename modules/app-configuration/{configuration-stores => configuration-store}/main.bicep (98%) rename modules/app-configuration/{configuration-stores => configuration-store}/main.json (100%) rename modules/app-configuration/{configuration-stores => configuration-store}/version.json (100%) rename modules/app/{container-apps => container-app}/.bicep/nested_roleAssignments.bicep (100%) rename modules/app/{container-apps => container-app}/.test/common/dependencies.bicep (100%) rename modules/app/{container-apps => container-app}/.test/common/main.test.bicep (100%) rename modules/app/{container-apps => container-app}/.test/main.test.bicep (100%) rename modules/app/{container-apps => container-app}/.test/min/dependencies.bicep (100%) rename modules/app/{container-apps => container-app}/.test/min/main.test.bicep (100%) rename modules/app/{container-apps => container-app}/README.md (99%) rename modules/app/{container-apps => container-app}/main.bicep (100%) rename modules/app/{container-apps => container-app}/main.json (100%) rename modules/app/{container-apps => container-app}/version.json (100%) rename modules/app/{managed-environments => managed-environment}/.bicep/nested_roleAssignments.bicep (100%) rename modules/app/{managed-environments => managed-environment}/.test/common/dependencies.bicep (100%) rename modules/app/{managed-environments => managed-environment}/.test/common/main.test.bicep (100%) rename modules/app/{managed-environments => managed-environment}/.test/main.test.bicep (100%) rename modules/app/{managed-environments => managed-environment}/.test/min/dependencies.bicep (100%) rename modules/app/{managed-environments => managed-environment}/.test/min/main.test.bicep (100%) rename modules/app/{managed-environments => managed-environment}/README.md (98%) rename modules/app/{managed-environments => managed-environment}/main.bicep (100%) rename modules/app/{managed-environments => managed-environment}/main.json (100%) rename modules/app/{managed-environments => managed-environment}/version.json (100%) rename modules/authorization/{locks => lock}/.test/common/main.test.bicep (100%) rename modules/authorization/{locks => lock}/.test/main.test.bicep (100%) rename modules/authorization/{locks => lock}/README.md (98%) rename modules/authorization/{locks => lock}/main.bicep (100%) rename modules/authorization/{locks => lock}/main.json (100%) rename modules/authorization/{locks => lock}/resource-group/README.md (100%) rename modules/authorization/{locks => lock}/resource-group/main.bicep (100%) rename modules/authorization/{locks => lock}/resource-group/main.json (100%) rename modules/authorization/{locks => lock}/resource-group/version.json (100%) rename modules/authorization/{locks => lock}/subscription/README.md (100%) rename modules/authorization/{locks => lock}/subscription/main.bicep (100%) rename modules/authorization/{locks => lock}/subscription/main.json (100%) rename modules/authorization/{locks => lock}/subscription/version.json (100%) rename modules/authorization/{locks => lock}/version.json (100%) rename modules/authorization/{policy-assignments => policy-assignment}/.test/main.test.bicep (100%) rename modules/authorization/{policy-assignments => policy-assignment}/.test/mg.common/main.test.bicep (100%) rename modules/authorization/{policy-assignments => policy-assignment}/.test/mg.min/main.test.bicep (100%) rename modules/authorization/{policy-assignments => policy-assignment}/.test/rg.common/dependencies.bicep (100%) rename modules/authorization/{policy-assignments => policy-assignment}/.test/rg.common/main.test.bicep (100%) rename modules/authorization/{policy-assignments => policy-assignment}/.test/rg.min/main.test.bicep (100%) rename modules/authorization/{policy-assignments => policy-assignment}/.test/sub.common/dependencies.bicep (100%) rename modules/authorization/{policy-assignments => policy-assignment}/.test/sub.common/main.test.bicep (100%) rename modules/authorization/{policy-assignments => policy-assignment}/.test/sub.min/main.test.bicep (100%) rename modules/authorization/{policy-assignments => policy-assignment}/README.md (97%) rename modules/authorization/{policy-assignments => policy-assignment}/main.bicep (100%) rename modules/authorization/{policy-assignments => policy-assignment}/main.json (100%) rename modules/authorization/{policy-assignments => policy-assignment}/management-group/README.md (100%) rename modules/authorization/{policy-assignments => policy-assignment}/management-group/main.bicep (100%) rename modules/authorization/{policy-assignments => policy-assignment}/management-group/main.json (100%) rename modules/authorization/{policy-assignments => policy-assignment}/management-group/version.json (100%) rename modules/authorization/{policy-assignments => policy-assignment}/resource-group/README.md (100%) rename modules/authorization/{policy-assignments => policy-assignment}/resource-group/main.bicep (100%) rename modules/authorization/{policy-assignments => policy-assignment}/resource-group/main.json (100%) rename modules/authorization/{policy-assignments => policy-assignment}/resource-group/version.json (100%) rename modules/authorization/{policy-assignments => policy-assignment}/subscription/README.md (100%) rename modules/authorization/{policy-assignments => policy-assignment}/subscription/main.bicep (100%) rename modules/authorization/{policy-assignments => policy-assignment}/subscription/main.json (100%) rename modules/authorization/{policy-assignments => policy-assignment}/subscription/version.json (100%) rename modules/authorization/{policy-assignments => policy-assignment}/version.json (100%) rename modules/authorization/{policy-definitions => policy-definition}/.test/main.test.bicep (100%) rename modules/authorization/{policy-definitions => policy-definition}/.test/mg.common/main.test.bicep (100%) rename modules/authorization/{policy-definitions => policy-definition}/.test/mg.min/main.test.bicep (100%) rename modules/authorization/{policy-definitions => policy-definition}/.test/sub.common/main.test.bicep (100%) rename modules/authorization/{policy-definitions => policy-definition}/.test/sub.min/main.test.bicep (100%) rename modules/authorization/{policy-definitions => policy-definition}/README.md (97%) rename modules/authorization/{policy-definitions => policy-definition}/main.bicep (100%) rename modules/authorization/{policy-definitions => policy-definition}/main.json (100%) rename modules/authorization/{policy-definitions => policy-definition}/management-group/README.md (100%) rename modules/authorization/{policy-definitions => policy-definition}/management-group/main.bicep (100%) rename modules/authorization/{policy-definitions => policy-definition}/management-group/main.json (100%) rename modules/authorization/{policy-definitions => policy-definition}/management-group/version.json (100%) rename modules/authorization/{policy-definitions => policy-definition}/subscription/README.md (100%) rename modules/authorization/{policy-definitions => policy-definition}/subscription/main.bicep (100%) rename modules/authorization/{policy-definitions => policy-definition}/subscription/main.json (100%) rename modules/authorization/{policy-definitions => policy-definition}/subscription/version.json (100%) rename modules/authorization/{policy-definitions => policy-definition}/version.json (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/.test/main.test.bicep (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/.test/mg.common/main.test.bicep (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/.test/mg.min/main.test.bicep (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/.test/rg.common/main.test.bicep (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/.test/rg.min/main.test.bicep (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/.test/sub.common/main.test.bicep (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/.test/sub.min/main.test.bicep (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/README.md (96%) rename modules/authorization/{policy-exemptions => policy-exemption}/main.bicep (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/main.json (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/management-group/README.md (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/management-group/main.bicep (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/management-group/main.json (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/management-group/version.json (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/resource-group/README.md (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/resource-group/main.bicep (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/resource-group/main.json (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/resource-group/version.json (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/subscription/README.md (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/subscription/main.bicep (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/subscription/main.json (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/subscription/version.json (100%) rename modules/authorization/{policy-exemptions => policy-exemption}/version.json (100%) rename modules/authorization/{policy-set-definitions => policy-set-definition}/.test/main.test.bicep (100%) rename modules/authorization/{policy-set-definitions => policy-set-definition}/.test/mg.common/main.test.bicep (100%) rename modules/authorization/{policy-set-definitions => policy-set-definition}/.test/mg.min/main.test.bicep (100%) rename modules/authorization/{policy-set-definitions => policy-set-definition}/.test/sub.common/main.test.bicep (100%) rename modules/authorization/{policy-set-definitions => policy-set-definition}/.test/sub.min/main.test.bicep (100%) rename modules/authorization/{policy-set-definitions => policy-set-definition}/README.md (97%) rename modules/authorization/{policy-set-definitions => policy-set-definition}/main.bicep (100%) rename modules/authorization/{policy-set-definitions => policy-set-definition}/main.json (100%) rename modules/authorization/{policy-set-definitions => policy-set-definition}/management-group/README.md (100%) rename modules/authorization/{policy-set-definitions => policy-set-definition}/management-group/main.bicep (100%) rename modules/authorization/{policy-set-definitions => policy-set-definition}/management-group/main.json (100%) rename modules/authorization/{policy-set-definitions => policy-set-definition}/management-group/version.json (100%) rename modules/authorization/{policy-set-definitions => policy-set-definition}/subscription/README.md (100%) rename modules/authorization/{policy-set-definitions => policy-set-definition}/subscription/main.bicep (100%) rename modules/authorization/{policy-set-definitions => policy-set-definition}/subscription/main.json (100%) rename modules/authorization/{policy-set-definitions => policy-set-definition}/subscription/version.json (100%) rename modules/authorization/{policy-set-definitions => policy-set-definition}/version.json (100%) rename modules/authorization/{role-assignments => role-assignment}/.test/main.test.bicep (100%) rename modules/authorization/{role-assignments => role-assignment}/.test/mg.common/dependencies.bicep (100%) rename modules/authorization/{role-assignments => role-assignment}/.test/mg.common/interim.dependencies.bicep (100%) rename modules/authorization/{role-assignments => role-assignment}/.test/mg.common/main.test.bicep (100%) rename modules/authorization/{role-assignments => role-assignment}/.test/mg.min/dependencies.bicep (100%) rename modules/authorization/{role-assignments => role-assignment}/.test/mg.min/interim.dependencies.bicep (100%) rename modules/authorization/{role-assignments => role-assignment}/.test/mg.min/main.test.bicep (100%) rename modules/authorization/{role-assignments => role-assignment}/.test/rg.common/dependencies.bicep (100%) rename modules/authorization/{role-assignments => role-assignment}/.test/rg.common/main.test.bicep (100%) rename modules/authorization/{role-assignments => role-assignment}/.test/rg.min/dependencies.bicep (100%) rename modules/authorization/{role-assignments => role-assignment}/.test/rg.min/main.test.bicep (100%) rename modules/authorization/{role-assignments => role-assignment}/.test/sub.common/dependencies.bicep (100%) rename modules/authorization/{role-assignments => role-assignment}/.test/sub.common/main.test.bicep (100%) rename modules/authorization/{role-assignments => role-assignment}/.test/sub.min/dependencies.bicep (100%) rename modules/authorization/{role-assignments => role-assignment}/.test/sub.min/main.test.bicep (100%) rename modules/authorization/{role-assignments => role-assignment}/README.md (96%) rename modules/authorization/{role-assignments => role-assignment}/main.bicep (100%) rename modules/authorization/{role-assignments => role-assignment}/main.json (100%) rename modules/authorization/{role-assignments => role-assignment}/management-group/README.md (100%) rename modules/authorization/{role-assignments => role-assignment}/management-group/main.bicep (100%) rename modules/authorization/{role-assignments => role-assignment}/management-group/main.json (100%) rename modules/authorization/{role-assignments => role-assignment}/management-group/version.json (100%) rename modules/authorization/{role-assignments => role-assignment}/resource-group/README.md (100%) rename modules/authorization/{role-assignments => role-assignment}/resource-group/main.bicep (100%) rename modules/authorization/{role-assignments => role-assignment}/resource-group/main.json (100%) rename modules/authorization/{role-assignments => role-assignment}/resource-group/version.json (100%) rename modules/authorization/{role-assignments => role-assignment}/subscription/README.md (100%) rename modules/authorization/{role-assignments => role-assignment}/subscription/main.bicep (100%) rename modules/authorization/{role-assignments => role-assignment}/subscription/main.json (100%) rename modules/authorization/{role-assignments => role-assignment}/subscription/version.json (100%) rename modules/authorization/{role-assignments => role-assignment}/version.json (100%) rename modules/authorization/{role-definitions => role-definition}/.test/main.test.bicep (100%) rename modules/authorization/{role-definitions => role-definition}/.test/mg.common/main.test.bicep (100%) rename modules/authorization/{role-definitions => role-definition}/.test/mg.min/main.test.bicep (100%) rename modules/authorization/{role-definitions => role-definition}/.test/rg.common/main.test.bicep (100%) rename modules/authorization/{role-definitions => role-definition}/.test/rg.min/main.test.bicep (100%) rename modules/authorization/{role-definitions => role-definition}/.test/sub.common/main.test.bicep (100%) rename modules/authorization/{role-definitions => role-definition}/.test/sub.min/main.test.bicep (100%) rename modules/authorization/{role-definitions => role-definition}/README.md (96%) rename modules/authorization/{role-definitions => role-definition}/main.bicep (100%) rename modules/authorization/{role-definitions => role-definition}/main.json (100%) rename modules/authorization/{role-definitions => role-definition}/management-group/README.md (100%) rename modules/authorization/{role-definitions => role-definition}/management-group/main.bicep (100%) rename modules/authorization/{role-definitions => role-definition}/management-group/main.json (100%) rename modules/authorization/{role-definitions => role-definition}/management-group/version.json (100%) rename modules/authorization/{role-definitions => role-definition}/resource-group/README.md (100%) rename modules/authorization/{role-definitions => role-definition}/resource-group/main.bicep (100%) rename modules/authorization/{role-definitions => role-definition}/resource-group/main.json (100%) rename modules/authorization/{role-definitions => role-definition}/resource-group/version.json (100%) rename modules/authorization/{role-definitions => role-definition}/subscription/README.md (100%) rename modules/authorization/{role-definitions => role-definition}/subscription/main.bicep (100%) rename modules/authorization/{role-definitions => role-definition}/subscription/main.json (100%) rename modules/authorization/{role-definitions => role-definition}/subscription/version.json (100%) rename modules/authorization/{role-definitions => role-definition}/version.json (100%) rename modules/automation/{automation-accounts => automation-account}/.bicep/nested_roleAssignments.bicep (100%) rename modules/automation/{automation-accounts => automation-account}/.test/common/dependencies.bicep (100%) rename modules/automation/{automation-accounts => automation-account}/.test/common/main.test.bicep (100%) rename modules/automation/{automation-accounts => automation-account}/.test/encr/dependencies.bicep (100%) rename modules/automation/{automation-accounts => automation-account}/.test/encr/main.test.bicep (100%) rename modules/automation/{automation-accounts => automation-account}/.test/main.test.bicep (100%) rename modules/automation/{automation-accounts => automation-account}/.test/min/main.test.bicep (100%) rename modules/automation/{automation-accounts => automation-account}/README.md (99%) rename modules/automation/{automation-accounts => automation-account}/job-schedules/README.md (100%) rename modules/automation/{automation-accounts => automation-account}/job-schedules/main.bicep (100%) rename modules/automation/{automation-accounts => automation-account}/job-schedules/main.json (100%) rename modules/automation/{automation-accounts => automation-account}/job-schedules/version.json (100%) rename modules/automation/{automation-accounts => automation-account}/main.bicep (95%) rename modules/automation/{automation-accounts => automation-account}/main.json (100%) rename modules/automation/{automation-accounts => automation-account}/modules/README.md (100%) rename modules/automation/{automation-accounts => automation-account}/modules/main.bicep (100%) rename modules/automation/{automation-accounts => automation-account}/modules/main.json (100%) rename modules/automation/{automation-accounts => automation-account}/modules/version.json (100%) rename modules/automation/{automation-accounts => automation-account}/runbooks/README.md (100%) rename modules/automation/{automation-accounts => automation-account}/runbooks/main.bicep (100%) rename modules/automation/{automation-accounts => automation-account}/runbooks/main.json (100%) rename modules/automation/{automation-accounts => automation-account}/runbooks/version.json (100%) rename modules/automation/{automation-accounts => automation-account}/schedules/README.md (100%) rename modules/automation/{automation-accounts => automation-account}/schedules/main.bicep (100%) rename modules/automation/{automation-accounts => automation-account}/schedules/main.json (100%) rename modules/automation/{automation-accounts => automation-account}/schedules/version.json (100%) rename modules/automation/{automation-accounts => automation-account}/software-update-configurations/README.md (100%) rename modules/automation/{automation-accounts => automation-account}/software-update-configurations/main.bicep (100%) rename modules/automation/{automation-accounts => automation-account}/software-update-configurations/main.json (100%) rename modules/automation/{automation-accounts => automation-account}/software-update-configurations/version.json (100%) rename modules/automation/{automation-accounts => automation-account}/variables/README.md (100%) rename modules/automation/{automation-accounts => automation-account}/variables/main.bicep (100%) rename modules/automation/{automation-accounts => automation-account}/variables/main.json (100%) rename modules/automation/{automation-accounts => automation-account}/variables/version.json (100%) rename modules/automation/{automation-accounts => automation-account}/version.json (100%) rename modules/batch/{batch-accounts => batch-account}/.test/common/dependencies.bicep (100%) rename modules/batch/{batch-accounts => batch-account}/.test/common/main.test.bicep (100%) rename modules/batch/{batch-accounts => batch-account}/.test/encr/dependencies.bicep (100%) rename modules/batch/{batch-accounts => batch-account}/.test/encr/main.test.bicep (100%) rename modules/batch/{batch-accounts => batch-account}/.test/main.test.bicep (100%) rename modules/batch/{batch-accounts => batch-account}/.test/min/dependencies.bicep (100%) rename modules/batch/{batch-accounts => batch-account}/.test/min/main.test.bicep (100%) rename modules/batch/{batch-accounts => batch-account}/README.md (99%) rename modules/batch/{batch-accounts => batch-account}/main.bicep (99%) rename modules/batch/{batch-accounts => batch-account}/main.json (100%) rename modules/batch/{batch-accounts => batch-account}/version.json (100%) rename modules/cdn/profiles/{endpoints => endpoint}/README.md (100%) rename modules/cdn/profiles/{endpoints => endpoint}/main.bicep (97%) rename modules/cdn/profiles/{endpoints => endpoint}/main.json (100%) rename modules/cdn/profiles/{endpoints => endpoint}/origins/README.md (100%) rename modules/cdn/profiles/{endpoints => endpoint}/origins/main.bicep (100%) rename modules/cdn/profiles/{endpoints => endpoint}/origins/main.json (100%) rename modules/cdn/profiles/{endpoints => endpoint}/origins/version.json (100%) rename modules/cdn/profiles/{endpoints => endpoint}/version.json (100%) rename modules/cognitive-services/{accounts => account}/.bicep/nested_roleAssignments.bicep (100%) rename modules/cognitive-services/{accounts => account}/.test/common/dependencies.bicep (100%) rename modules/cognitive-services/{accounts => account}/.test/common/main.test.bicep (100%) rename modules/cognitive-services/{accounts => account}/.test/encr/dependencies.bicep (100%) rename modules/cognitive-services/{accounts => account}/.test/encr/main.test.bicep (100%) rename modules/cognitive-services/{accounts => account}/.test/main.test.bicep (100%) rename modules/cognitive-services/{accounts => account}/.test/min/main.test.bicep (100%) rename modules/cognitive-services/{accounts => account}/.test/speech/dependencies.bicep (100%) rename modules/cognitive-services/{accounts => account}/.test/speech/main.test.bicep (100%) rename modules/cognitive-services/{accounts => account}/README.md (99%) rename modules/cognitive-services/{accounts => account}/main.bicep (99%) rename modules/cognitive-services/{accounts => account}/main.json (100%) rename modules/cognitive-services/{accounts => account}/version.json (100%) rename modules/compute/{availability-sets => availability-set}/.bicep/nested_roleAssignments.bicep (100%) rename modules/compute/{availability-sets => availability-set}/.test/common/dependencies.bicep (100%) rename modules/compute/{availability-sets => availability-set}/.test/common/main.test.bicep (100%) rename modules/compute/{availability-sets => availability-set}/.test/main.test.bicep (100%) rename modules/compute/{availability-sets => availability-set}/.test/min/main.test.bicep (100%) rename modules/compute/{availability-sets => availability-set}/README.md (98%) rename modules/compute/{availability-sets => availability-set}/main.bicep (100%) rename modules/compute/{availability-sets => availability-set}/main.json (100%) rename modules/compute/{availability-sets => availability-set}/version.json (100%) rename modules/compute/{disk-encryption-sets => disk-encryption-set}/.bicep/nested_keyVaultPermissions.bicep (94%) rename modules/compute/{disk-encryption-sets => disk-encryption-set}/.bicep/nested_managedIdentityReference.bicep (100%) rename modules/compute/{disk-encryption-sets => disk-encryption-set}/.bicep/nested_roleAssignments.bicep (100%) rename modules/compute/{disk-encryption-sets => disk-encryption-set}/.test/accessPolicies/dependencies.bicep (100%) rename modules/compute/{disk-encryption-sets => disk-encryption-set}/.test/accessPolicies/main.test.bicep (100%) rename modules/compute/{disk-encryption-sets => disk-encryption-set}/.test/common/dependencies.bicep (100%) rename modules/compute/{disk-encryption-sets => disk-encryption-set}/.test/common/main.test.bicep (100%) rename modules/compute/{disk-encryption-sets => disk-encryption-set}/.test/main.test.bicep (100%) rename modules/compute/{disk-encryption-sets => disk-encryption-set}/README.md (98%) rename modules/compute/{disk-encryption-sets => disk-encryption-set}/main.bicep (100%) rename modules/compute/{disk-encryption-sets => disk-encryption-set}/main.json (100%) rename modules/compute/{disk-encryption-sets => disk-encryption-set}/version.json (100%) rename modules/compute/{disks => disk}/.bicep/nested_roleAssignments.bicep (100%) rename modules/compute/{disks => disk}/.test/common/dependencies.bicep (100%) rename modules/compute/{disks => disk}/.test/common/main.test.bicep (100%) rename modules/compute/{disks => disk}/.test/image/dependencies.bicep (100%) rename modules/compute/{disks => disk}/.test/image/main.test.bicep (100%) rename modules/compute/{disks => disk}/.test/import/dependencies.bicep (100%) rename modules/compute/{disks => disk}/.test/import/dependencies_rbac.bicep (100%) rename modules/compute/{disks => disk}/.test/import/main.test.bicep (100%) rename modules/compute/{disks => disk}/.test/main.test.bicep (100%) rename modules/compute/{disks => disk}/.test/min/main.test.bicep (100%) rename modules/compute/{disks => disk}/README.md (98%) rename modules/compute/{disks => disk}/main.bicep (100%) rename modules/compute/{disks => disk}/main.json (100%) rename modules/compute/{disks => disk}/version.json (100%) rename modules/compute/{galleries => gallery}/.bicep/nested_roleAssignments.bicep (100%) rename modules/compute/{galleries => gallery}/.test/common/dependencies.bicep (100%) rename modules/compute/{galleries => gallery}/.test/common/main.test.bicep (100%) rename modules/compute/{galleries => gallery}/.test/main.test.bicep (100%) rename modules/compute/{galleries => gallery}/.test/min/main.test.bicep (100%) rename modules/compute/{galleries => gallery}/README.md (99%) rename modules/compute/{galleries => gallery}/applications/.bicep/nested_roleAssignments.bicep (100%) rename modules/compute/{galleries => gallery}/applications/README.md (100%) rename modules/compute/{galleries => gallery}/applications/main.bicep (100%) rename modules/compute/{galleries => gallery}/applications/main.json (100%) rename modules/compute/{galleries => gallery}/applications/version.json (100%) rename modules/compute/{galleries => gallery}/images/.bicep/nested_roleAssignments.bicep (100%) rename modules/compute/{galleries => gallery}/images/README.md (100%) rename modules/compute/{galleries => gallery}/images/main.bicep (100%) rename modules/compute/{galleries => gallery}/images/main.json (100%) rename modules/compute/{galleries => gallery}/images/version.json (100%) rename modules/compute/{galleries => gallery}/main.bicep (97%) rename modules/compute/{galleries => gallery}/main.json (100%) rename modules/compute/{galleries => gallery}/version.json (100%) rename modules/compute/{images => image}/.bicep/nested_roleAssignments.bicep (100%) rename modules/compute/{images => image}/.test/common/dependencies.bicep (100%) rename modules/compute/{images => image}/.test/common/dependencies_rbac.bicep (100%) rename modules/compute/{images => image}/.test/common/main.test.bicep (100%) rename modules/compute/{images => image}/.test/main.test.bicep (100%) rename modules/compute/{images => image}/README.md (99%) rename modules/compute/{images => image}/main.bicep (100%) rename modules/compute/{images => image}/main.json (100%) rename modules/compute/{images => image}/version.json (100%) rename modules/compute/{proximity-placement-groups => proximity-placement-group}/.bicep/nested_roleAssignments.bicep (100%) rename modules/compute/{proximity-placement-groups => proximity-placement-group}/.test/common/dependencies.bicep (100%) rename modules/compute/{proximity-placement-groups => proximity-placement-group}/.test/common/main.test.bicep (100%) rename modules/compute/{proximity-placement-groups => proximity-placement-group}/.test/main.test.bicep (100%) rename modules/compute/{proximity-placement-groups => proximity-placement-group}/.test/min/main.test.bicep (100%) rename modules/compute/{proximity-placement-groups => proximity-placement-group}/README.md (99%) rename modules/compute/{proximity-placement-groups => proximity-placement-group}/main.bicep (100%) rename modules/compute/{proximity-placement-groups => proximity-placement-group}/main.json (100%) rename modules/compute/{proximity-placement-groups => proximity-placement-group}/version.json (100%) rename modules/compute/{ssh-public-keys => ssh-public-key}/.bicep/nested_roleAssignments.bicep (100%) rename modules/compute/{ssh-public-keys => ssh-public-key}/.test/common/dependencies.bicep (100%) rename modules/compute/{ssh-public-keys => ssh-public-key}/.test/common/main.test.bicep (100%) rename modules/compute/{ssh-public-keys => ssh-public-key}/.test/main.test.bicep (100%) rename modules/compute/{ssh-public-keys => ssh-public-key}/.test/min/main.test.bicep (100%) rename modules/compute/{ssh-public-keys => ssh-public-key}/README.md (98%) rename modules/compute/{ssh-public-keys => ssh-public-key}/main.bicep (100%) rename modules/compute/{ssh-public-keys => ssh-public-key}/main.json (100%) rename modules/compute/{ssh-public-keys => ssh-public-key}/version.json (100%) rename modules/compute/{virtual-machine-scale-sets => virtual-machine-scale-set}/.bicep/nested_roleAssignments.bicep (100%) rename modules/compute/{virtual-machine-scale-sets => virtual-machine-scale-set}/.test/linux.min/dependencies.bicep (100%) rename modules/compute/{virtual-machine-scale-sets => virtual-machine-scale-set}/.test/linux.min/main.test.bicep (100%) rename modules/compute/{virtual-machine-scale-sets => virtual-machine-scale-set}/.test/linux.ssecmk/dependencies.bicep (100%) rename modules/compute/{virtual-machine-scale-sets => virtual-machine-scale-set}/.test/linux.ssecmk/main.test.bicep (100%) rename modules/compute/{virtual-machine-scale-sets => virtual-machine-scale-set}/.test/linux/dependencies.bicep (100%) rename modules/compute/{virtual-machine-scale-sets => virtual-machine-scale-set}/.test/linux/main.test.bicep (100%) rename modules/compute/{virtual-machine-scale-sets => virtual-machine-scale-set}/.test/main.test.bicep (100%) rename modules/compute/{virtual-machine-scale-sets => virtual-machine-scale-set}/.test/windows.min/dependencies.bicep (100%) rename modules/compute/{virtual-machine-scale-sets => virtual-machine-scale-set}/.test/windows.min/main.test.bicep (100%) rename modules/compute/{virtual-machine-scale-sets => virtual-machine-scale-set}/.test/windows/dependencies.bicep (100%) rename modules/compute/{virtual-machine-scale-sets => virtual-machine-scale-set}/.test/windows/main.test.bicep (100%) rename modules/compute/{virtual-machine-scale-sets => virtual-machine-scale-set}/README.md (99%) rename modules/compute/{virtual-machine-scale-sets => virtual-machine-scale-set}/extensions/README.md (100%) rename modules/compute/{virtual-machine-scale-sets => virtual-machine-scale-set}/extensions/main.bicep (100%) rename modules/compute/{virtual-machine-scale-sets => virtual-machine-scale-set}/extensions/main.json (100%) rename modules/compute/{virtual-machine-scale-sets => virtual-machine-scale-set}/extensions/version.json (100%) rename modules/compute/{virtual-machine-scale-sets => virtual-machine-scale-set}/main.bicep (97%) rename modules/compute/{virtual-machine-scale-sets => virtual-machine-scale-set}/main.json (100%) rename modules/compute/{virtual-machine-scale-sets => virtual-machine-scale-set}/version.json (100%) rename modules/compute/{virtual-machines => virtual-machine}/.bicep/nested_networkInterface.bicep (96%) rename modules/compute/{virtual-machines => virtual-machine}/.bicep/nested_roleAssignments.bicep (100%) rename modules/compute/{virtual-machines => virtual-machine}/.test/linux.atmg/dependencies.bicep (100%) rename modules/compute/{virtual-machines => virtual-machine}/.test/linux.atmg/main.test.bicep (100%) rename modules/compute/{virtual-machines => virtual-machine}/.test/linux.min/dependencies.bicep (100%) rename modules/compute/{virtual-machines => virtual-machine}/.test/linux.min/main.test.bicep (100%) rename modules/compute/{virtual-machines => virtual-machine}/.test/linux/dependencies.bicep (100%) rename modules/compute/{virtual-machines => virtual-machine}/.test/linux/main.test.bicep (100%) rename modules/compute/{virtual-machines => virtual-machine}/.test/main.test.bicep (100%) rename modules/compute/{virtual-machines => virtual-machine}/.test/windows.atmg/dependencies.bicep (100%) rename modules/compute/{virtual-machines => virtual-machine}/.test/windows.atmg/main.test.bicep (100%) rename modules/compute/{virtual-machines => virtual-machine}/.test/windows.min/dependencies.bicep (100%) rename modules/compute/{virtual-machines => virtual-machine}/.test/windows.min/main.test.bicep (100%) rename modules/compute/{virtual-machines => virtual-machine}/.test/windows.ssecmk/dependencies.bicep (100%) rename modules/compute/{virtual-machines => virtual-machine}/.test/windows.ssecmk/main.test.bicep (100%) rename modules/compute/{virtual-machines => virtual-machine}/.test/windows/dependencies.bicep (100%) rename modules/compute/{virtual-machines => virtual-machine}/.test/windows/main.test.bicep (100%) rename modules/compute/{virtual-machines => virtual-machine}/README.md (99%) rename modules/compute/{virtual-machines => virtual-machine}/extensions/README.md (100%) rename modules/compute/{virtual-machines => virtual-machine}/extensions/main.bicep (100%) rename modules/compute/{virtual-machines => virtual-machine}/extensions/main.json (100%) rename modules/compute/{virtual-machines => virtual-machine}/extensions/version.json (100%) rename modules/compute/{virtual-machines => virtual-machine}/main.bicep (97%) rename modules/compute/{virtual-machines => virtual-machine}/main.json (100%) rename modules/compute/{virtual-machines => virtual-machine}/version.json (100%) rename modules/consumption/{budgets => budget}/.test/common/main.test.bicep (100%) rename modules/consumption/{budgets => budget}/.test/main.test.bicep (100%) rename modules/consumption/{budgets => budget}/.test/min/main.test.bicep (100%) rename modules/consumption/{budgets => budget}/README.md (98%) rename modules/consumption/{budgets => budget}/main.bicep (100%) rename modules/consumption/{budgets => budget}/main.json (100%) rename modules/consumption/{budgets => budget}/version.json (100%) rename modules/container-instance/{container-groups => container-group}/.test/common/dependencies.bicep (100%) rename modules/container-instance/{container-groups => container-group}/.test/common/main.test.bicep (100%) rename modules/container-instance/{container-groups => container-group}/.test/encr/dependencies.bicep (100%) rename modules/container-instance/{container-groups => container-group}/.test/encr/main.test.bicep (100%) rename modules/container-instance/{container-groups => container-group}/.test/main.test.bicep (100%) rename modules/container-instance/{container-groups => container-group}/.test/min/main.test.bicep (100%) rename modules/container-instance/{container-groups => container-group}/.test/private/dependencies.bicep (100%) rename modules/container-instance/{container-groups => container-group}/.test/private/main.test.bicep (100%) rename modules/container-instance/{container-groups => container-group}/README.md (98%) rename modules/container-instance/{container-groups => container-group}/main.bicep (100%) rename modules/container-instance/{container-groups => container-group}/main.json (100%) rename modules/container-instance/{container-groups => container-group}/version.json (100%) rename modules/container-registry/{registries => registry}/.bicep/nested_roleAssignments.bicep (100%) rename modules/container-registry/{registries => registry}/.test/common/dependencies.bicep (100%) rename modules/container-registry/{registries => registry}/.test/common/main.test.bicep (100%) rename modules/container-registry/{registries => registry}/.test/encr/dependencies.bicep (100%) rename modules/container-registry/{registries => registry}/.test/encr/main.test.bicep (100%) rename modules/container-registry/{registries => registry}/.test/main.test.bicep (100%) rename modules/container-registry/{registries => registry}/.test/min/main.test.bicep (100%) rename modules/container-registry/{registries => registry}/.test/pe/dependencies.bicep (100%) rename modules/container-registry/{registries => registry}/.test/pe/main.test.bicep (100%) rename modules/container-registry/{registries => registry}/README.md (99%) rename modules/container-registry/{registries => registry}/main.bicep (98%) rename modules/container-registry/{registries => registry}/main.json (100%) rename modules/container-registry/{registries => registry}/replications/README.md (100%) rename modules/container-registry/{registries => registry}/replications/main.bicep (100%) rename modules/container-registry/{registries => registry}/replications/main.json (100%) rename modules/container-registry/{registries => registry}/replications/version.json (100%) rename modules/container-registry/{registries => registry}/version.json (100%) rename modules/container-registry/{registries => registry}/webhooks/README.md (100%) rename modules/container-registry/{registries => registry}/webhooks/main.bicep (100%) rename modules/container-registry/{registries => registry}/webhooks/main.json (100%) rename modules/container-registry/{registries => registry}/webhooks/version.json (100%) rename modules/container-service/{managed-clusters => managed-cluster}/.bicep/nested_roleAssignments.bicep (100%) rename modules/container-service/{managed-clusters => managed-cluster}/.test/azure/dependencies.bicep (100%) rename modules/container-service/{managed-clusters => managed-cluster}/.test/azure/main.test.bicep (100%) rename modules/container-service/{managed-clusters => managed-cluster}/.test/kubenet/dependencies.bicep (100%) rename modules/container-service/{managed-clusters => managed-cluster}/.test/kubenet/main.test.bicep (100%) rename modules/container-service/{managed-clusters => managed-cluster}/.test/main.test.bicep (100%) rename modules/container-service/{managed-clusters => managed-cluster}/.test/min/main.test.bicep (100%) rename modules/container-service/{managed-clusters => managed-cluster}/.test/priv/dependencies.bicep (100%) rename modules/container-service/{managed-clusters => managed-cluster}/.test/priv/main.test.bicep (100%) rename modules/container-service/{managed-clusters => managed-cluster}/README.md (99%) rename modules/container-service/{managed-clusters => managed-cluster}/agent-pools/README.md (100%) rename modules/container-service/{managed-clusters => managed-cluster}/agent-pools/main.bicep (100%) rename modules/container-service/{managed-clusters => managed-cluster}/agent-pools/main.json (100%) rename modules/container-service/{managed-clusters => managed-cluster}/agent-pools/version.json (100%) rename modules/container-service/{managed-clusters => managed-cluster}/main.bicep (99%) rename modules/container-service/{managed-clusters => managed-cluster}/main.json (100%) rename modules/container-service/{managed-clusters => managed-cluster}/version.json (100%) rename modules/data-factory/factories/{integration-runtimes => integration-runtime}/README.md (100%) rename modules/data-factory/factories/{integration-runtimes => integration-runtime}/main.bicep (100%) rename modules/data-factory/factories/{integration-runtimes => integration-runtime}/main.json (100%) rename modules/data-factory/factories/{integration-runtimes => integration-runtime}/version.json (100%) rename modules/data-factory/factories/{managed-virtual-networks => managed-virtual-network}/README.md (100%) rename modules/data-factory/factories/{managed-virtual-networks => managed-virtual-network}/main.bicep (95%) rename modules/data-factory/factories/{managed-virtual-networks => managed-virtual-network}/main.json (100%) rename modules/data-factory/factories/{managed-virtual-networks => managed-virtual-network}/managed-private-endpoints/README.md (100%) rename modules/data-factory/factories/{managed-virtual-networks => managed-virtual-network}/managed-private-endpoints/main.bicep (100%) rename modules/data-factory/factories/{managed-virtual-networks => managed-virtual-network}/managed-private-endpoints/main.json (100%) rename modules/data-factory/factories/{managed-virtual-networks => managed-virtual-network}/managed-private-endpoints/version.json (100%) rename modules/data-factory/factories/{managed-virtual-networks => managed-virtual-network}/version.json (100%) rename modules/data-protection/{backup-vaults => backup-vault}/.bicep/nested_roleAssignments.bicep (100%) rename modules/data-protection/{backup-vaults => backup-vault}/.test/common/dependencies.bicep (100%) rename modules/data-protection/{backup-vaults => backup-vault}/.test/common/main.test.bicep (100%) rename modules/data-protection/{backup-vaults => backup-vault}/.test/main.test.bicep (100%) rename modules/data-protection/{backup-vaults => backup-vault}/.test/min/main.test.bicep (100%) rename modules/data-protection/{backup-vaults => backup-vault}/README.md (99%) rename modules/data-protection/{backup-vaults => backup-vault}/backup-policies/README.md (100%) rename modules/data-protection/{backup-vaults => backup-vault}/backup-policies/main.bicep (100%) rename modules/data-protection/{backup-vaults => backup-vault}/backup-policies/main.json (100%) rename modules/data-protection/{backup-vaults => backup-vault}/backup-policies/version.json (100%) rename modules/data-protection/{backup-vaults => backup-vault}/main.bicep (97%) rename modules/data-protection/{backup-vaults => backup-vault}/main.json (100%) rename modules/data-protection/{backup-vaults => backup-vault}/version.json (100%) rename modules/databricks/{workspaces => workspace}/.bicep/nested_roleAssignments.bicep (100%) rename modules/databricks/{workspaces => workspace}/.test/common/dependencies.bicep (100%) rename modules/databricks/{workspaces => workspace}/.test/common/main.test.bicep (100%) rename modules/databricks/{workspaces => workspace}/.test/main.test.bicep (100%) rename modules/databricks/{workspaces => workspace}/README.md (99%) rename modules/databricks/{workspaces => workspace}/main.bicep (100%) rename modules/databricks/{workspaces => workspace}/main.json (100%) rename modules/databricks/{workspaces => workspace}/version.json (100%) rename modules/db-for-my-sql/{flexible-servers => flexible-server}/.bicep/nested_roleAssignments.bicep (100%) rename modules/db-for-my-sql/{flexible-servers => flexible-server}/.test/main.test.bicep (100%) rename modules/db-for-my-sql/{flexible-servers => flexible-server}/.test/min/main.test.bicep (100%) rename modules/db-for-my-sql/{flexible-servers => flexible-server}/.test/private/dependencies.bicep (100%) rename modules/db-for-my-sql/{flexible-servers => flexible-server}/.test/private/main.test.bicep (100%) rename modules/db-for-my-sql/{flexible-servers => flexible-server}/.test/public/dependencies1.bicep (100%) rename modules/db-for-my-sql/{flexible-servers => flexible-server}/.test/public/dependencies2.bicep (100%) rename modules/db-for-my-sql/{flexible-servers => flexible-server}/.test/public/main.test.bicep (100%) rename modules/db-for-my-sql/{flexible-servers => flexible-server}/README.md (99%) rename modules/db-for-my-sql/{flexible-servers => flexible-server}/databases/README.md (100%) rename modules/db-for-my-sql/{flexible-servers => flexible-server}/databases/main.bicep (100%) rename modules/db-for-my-sql/{flexible-servers => flexible-server}/databases/main.json (100%) rename modules/db-for-my-sql/{flexible-servers => flexible-server}/databases/version.json (100%) rename modules/db-for-my-sql/{flexible-servers => flexible-server}/firewall-rules/README.md (100%) rename modules/db-for-my-sql/{flexible-servers => flexible-server}/firewall-rules/main.bicep (100%) rename modules/db-for-my-sql/{flexible-servers => flexible-server}/firewall-rules/main.json (100%) rename modules/db-for-my-sql/{flexible-servers => flexible-server}/firewall-rules/version.json (100%) rename modules/db-for-my-sql/{flexible-servers => flexible-server}/main.bicep (98%) rename modules/db-for-my-sql/{flexible-servers => flexible-server}/main.json (100%) rename modules/db-for-my-sql/{flexible-servers => flexible-server}/version.json (100%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/.bicep/nested_roleAssignments.bicep (100%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/.test/main.test.bicep (100%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/.test/min/main.test.bicep (100%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/.test/private/dependencies.bicep (100%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/.test/private/main.test.bicep (100%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/.test/public/dependencies.bicep (100%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/.test/public/main.test.bicep (100%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/README.md (99%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/configurations/README.md (100%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/configurations/main.bicep (100%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/configurations/main.json (100%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/configurations/version.json (100%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/databases/README.md (100%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/databases/main.bicep (100%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/databases/main.json (100%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/databases/version.json (100%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/firewall-rules/README.md (100%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/firewall-rules/main.bicep (100%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/firewall-rules/main.json (100%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/firewall-rules/version.json (100%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/main.bicep (97%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/main.json (100%) rename modules/db-for-postgre-sql/{flexible-servers => flexible-server}/version.json (100%) rename modules/desktop-virtualization/{application-groups => application-group}/.bicep/nested_roleAssignments.bicep (100%) rename modules/desktop-virtualization/{application-groups => application-group}/.test/common/dependencies.bicep (100%) rename modules/desktop-virtualization/{application-groups => application-group}/.test/common/main.test.bicep (100%) rename modules/desktop-virtualization/{application-groups => application-group}/.test/main.test.bicep (100%) rename modules/desktop-virtualization/{application-groups => application-group}/.test/min/dependencies.bicep (100%) rename modules/desktop-virtualization/{application-groups => application-group}/.test/min/main.test.bicep (100%) rename modules/desktop-virtualization/{application-groups => application-group}/README.md (99%) rename modules/desktop-virtualization/{application-groups => application-group}/applications/README.md (100%) rename modules/desktop-virtualization/{application-groups => application-group}/applications/main.bicep (100%) rename modules/desktop-virtualization/{application-groups => application-group}/applications/main.json (100%) rename modules/desktop-virtualization/{application-groups => application-group}/applications/version.json (100%) rename modules/desktop-virtualization/{application-groups => application-group}/main.bicep (98%) rename modules/desktop-virtualization/{application-groups => application-group}/main.json (100%) rename modules/desktop-virtualization/{application-groups => application-group}/version.json (100%) rename modules/desktop-virtualization/{host-pools => host-pool}/.bicep/nested_roleAssignments.bicep (100%) rename modules/desktop-virtualization/{host-pools => host-pool}/.test/common/dependencies.bicep (100%) rename modules/desktop-virtualization/{host-pools => host-pool}/.test/common/main.test.bicep (100%) rename modules/desktop-virtualization/{host-pools => host-pool}/.test/main.test.bicep (100%) rename modules/desktop-virtualization/{host-pools => host-pool}/.test/min/main.test.bicep (100%) rename modules/desktop-virtualization/{host-pools => host-pool}/README.md (99%) rename modules/desktop-virtualization/{host-pools => host-pool}/main.bicep (100%) rename modules/desktop-virtualization/{host-pools => host-pool}/main.json (100%) rename modules/desktop-virtualization/{host-pools => host-pool}/version.json (100%) rename modules/desktop-virtualization/{scaling-plans => scaling-plan}/.bicep/nested_roleAssignments.bicep (100%) rename modules/desktop-virtualization/{scaling-plans => scaling-plan}/.test/common/dependencies.bicep (100%) rename modules/desktop-virtualization/{scaling-plans => scaling-plan}/.test/common/main.test.bicep (100%) rename modules/desktop-virtualization/{scaling-plans => scaling-plan}/.test/main.test.bicep (100%) rename modules/desktop-virtualization/{scaling-plans => scaling-plan}/.test/min/main.test.bicep (100%) rename modules/desktop-virtualization/{scaling-plans => scaling-plan}/README.md (98%) rename modules/desktop-virtualization/{scaling-plans => scaling-plan}/main.bicep (100%) rename modules/desktop-virtualization/{scaling-plans => scaling-plan}/main.json (100%) rename modules/desktop-virtualization/{scaling-plans => scaling-plan}/version.json (100%) rename modules/desktop-virtualization/{workspaces => workspace}/.bicep/nested_roleAssignments.bicep (100%) rename modules/desktop-virtualization/{workspaces => workspace}/.test/common/dependencies.bicep (100%) rename modules/desktop-virtualization/{workspaces => workspace}/.test/common/main.test.bicep (100%) rename modules/desktop-virtualization/{workspaces => workspace}/.test/main.test.bicep (100%) rename modules/desktop-virtualization/{workspaces => workspace}/.test/min/main.test.bicep (100%) rename modules/desktop-virtualization/{workspaces => workspace}/README.md (98%) rename modules/desktop-virtualization/{workspaces => workspace}/main.bicep (100%) rename modules/desktop-virtualization/{workspaces => workspace}/main.json (100%) rename modules/desktop-virtualization/{workspaces => workspace}/version.json (100%) rename modules/dev-test-lab/{labs => lab}/.bicep/nested_roleAssignments.bicep (100%) rename modules/dev-test-lab/{labs => lab}/.test/common/dependencies.bicep (100%) rename modules/dev-test-lab/{labs => lab}/.test/common/main.test.bicep (100%) rename modules/dev-test-lab/{labs => lab}/.test/main.test.bicep (100%) rename modules/dev-test-lab/{labs => lab}/.test/min/main.test.bicep (100%) rename modules/dev-test-lab/{labs => lab}/README.md (99%) rename modules/dev-test-lab/{labs => lab}/artifactsources/README.md (100%) rename modules/dev-test-lab/{labs => lab}/artifactsources/main.bicep (100%) rename modules/dev-test-lab/{labs => lab}/artifactsources/main.json (100%) rename modules/dev-test-lab/{labs => lab}/artifactsources/version.json (100%) rename modules/dev-test-lab/{labs => lab}/costs/README.md (100%) rename modules/dev-test-lab/{labs => lab}/costs/main.bicep (100%) rename modules/dev-test-lab/{labs => lab}/costs/main.json (100%) rename modules/dev-test-lab/{labs => lab}/costs/version.json (100%) rename modules/dev-test-lab/{labs => lab}/main.bicep (96%) rename modules/dev-test-lab/{labs => lab}/main.json (100%) rename modules/dev-test-lab/{labs => lab}/notificationchannels/README.md (100%) rename modules/dev-test-lab/{labs => lab}/notificationchannels/main.bicep (100%) rename modules/dev-test-lab/{labs => lab}/notificationchannels/main.json (100%) rename modules/dev-test-lab/{labs => lab}/notificationchannels/version.json (100%) rename modules/dev-test-lab/{labs => lab}/policysets/policies/README.md (100%) rename modules/dev-test-lab/{labs => lab}/policysets/policies/main.bicep (100%) rename modules/dev-test-lab/{labs => lab}/policysets/policies/main.json (100%) rename modules/dev-test-lab/{labs => lab}/policysets/policies/version.json (100%) rename modules/dev-test-lab/{labs => lab}/schedules/README.md (100%) rename modules/dev-test-lab/{labs => lab}/schedules/main.bicep (100%) rename modules/dev-test-lab/{labs => lab}/schedules/main.json (100%) rename modules/dev-test-lab/{labs => lab}/schedules/version.json (100%) rename modules/dev-test-lab/{labs => lab}/version.json (100%) rename modules/dev-test-lab/{labs => lab}/virtualnetworks/README.md (100%) rename modules/dev-test-lab/{labs => lab}/virtualnetworks/main.bicep (100%) rename modules/dev-test-lab/{labs => lab}/virtualnetworks/main.json (100%) rename modules/dev-test-lab/{labs => lab}/virtualnetworks/version.json (100%) rename modules/digital-twins/{digital-twins-instances => digital-twins-instance}/.bicep/nested_roleAssignments.bicep (100%) rename modules/digital-twins/{digital-twins-instances => digital-twins-instance}/.test/common/dependencies.bicep (100%) rename modules/digital-twins/{digital-twins-instances => digital-twins-instance}/.test/common/main.test.bicep (100%) rename modules/digital-twins/{digital-twins-instances => digital-twins-instance}/.test/main.test.bicep (100%) rename modules/digital-twins/{digital-twins-instances => digital-twins-instance}/.test/min/main.test.bicep (100%) rename modules/digital-twins/{digital-twins-instances => digital-twins-instance}/README.md (99%) rename modules/digital-twins/{digital-twins-instances => digital-twins-instance}/endpoints--event-grid/README.md (100%) rename modules/digital-twins/{digital-twins-instances => digital-twins-instance}/endpoints--event-grid/main.bicep (100%) rename modules/digital-twins/{digital-twins-instances => digital-twins-instance}/endpoints--event-grid/main.json (100%) rename modules/digital-twins/{digital-twins-instances => digital-twins-instance}/endpoints--event-grid/version.json (100%) rename modules/digital-twins/{digital-twins-instances => digital-twins-instance}/endpoints--event-hub/README.md (100%) rename modules/digital-twins/{digital-twins-instances => digital-twins-instance}/endpoints--event-hub/main.bicep (100%) rename modules/digital-twins/{digital-twins-instances => digital-twins-instance}/endpoints--event-hub/main.json (100%) rename modules/digital-twins/{digital-twins-instances => digital-twins-instance}/endpoints--event-hub/version.json (100%) rename modules/digital-twins/{digital-twins-instances => digital-twins-instance}/endpoints--service-bus/README.md (100%) rename modules/digital-twins/{digital-twins-instances => digital-twins-instance}/endpoints--service-bus/main.bicep (100%) rename modules/digital-twins/{digital-twins-instances => digital-twins-instance}/endpoints--service-bus/main.json (100%) rename modules/digital-twins/{digital-twins-instances => digital-twins-instance}/endpoints--service-bus/version.json (100%) rename modules/digital-twins/{digital-twins-instances => digital-twins-instance}/main.bicep (99%) rename modules/digital-twins/{digital-twins-instances => digital-twins-instance}/main.json (100%) rename modules/digital-twins/{digital-twins-instances => digital-twins-instance}/version.json (100%) rename modules/document-db/{database-accounts => database-account}/.bicep/nested_roleAssignments.bicep (100%) rename modules/document-db/{database-accounts => database-account}/.test/gremlindb/dependencies.bicep (100%) rename modules/document-db/{database-accounts => database-account}/.test/gremlindb/main.test.bicep (100%) rename modules/document-db/{database-accounts => database-account}/.test/main.test.bicep (100%) rename modules/document-db/{database-accounts => database-account}/.test/mongodb/dependencies.bicep (100%) rename modules/document-db/{database-accounts => database-account}/.test/mongodb/main.test.bicep (100%) rename modules/document-db/{database-accounts => database-account}/.test/plain/dependencies.bicep (100%) rename modules/document-db/{database-accounts => database-account}/.test/plain/main.test.bicep (100%) rename modules/document-db/{database-accounts => database-account}/.test/sqldb/dependencies.bicep (100%) rename modules/document-db/{database-accounts => database-account}/.test/sqldb/main.test.bicep (100%) rename modules/document-db/{database-accounts => database-account}/README.md (99%) rename modules/document-db/{database-accounts => database-account}/gremlin-databases/README.md (100%) rename modules/document-db/{database-accounts => database-account}/gremlin-databases/graphs/README.md (100%) rename modules/document-db/{database-accounts => database-account}/gremlin-databases/graphs/main.bicep (100%) rename modules/document-db/{database-accounts => database-account}/gremlin-databases/graphs/main.json (100%) rename modules/document-db/{database-accounts => database-account}/gremlin-databases/graphs/version.json (100%) rename modules/document-db/{database-accounts => database-account}/gremlin-databases/main.bicep (97%) rename modules/document-db/{database-accounts => database-account}/gremlin-databases/main.json (100%) rename modules/document-db/{database-accounts => database-account}/gremlin-databases/version.json (100%) rename modules/document-db/{database-accounts => database-account}/main.bicep (97%) rename modules/document-db/{database-accounts => database-account}/main.json (100%) rename modules/document-db/{database-accounts => database-account}/mongodb-databases/README.md (100%) rename modules/document-db/{database-accounts => database-account}/mongodb-databases/collections/README.md (100%) rename modules/document-db/{database-accounts => database-account}/mongodb-databases/collections/main.bicep (100%) rename modules/document-db/{database-accounts => database-account}/mongodb-databases/collections/main.json (100%) rename modules/document-db/{database-accounts => database-account}/mongodb-databases/collections/version.json (100%) rename modules/document-db/{database-accounts => database-account}/mongodb-databases/main.bicep (96%) rename modules/document-db/{database-accounts => database-account}/mongodb-databases/main.json (100%) rename modules/document-db/{database-accounts => database-account}/mongodb-databases/version.json (100%) rename modules/document-db/{database-accounts => database-account}/sql-databases/README.md (100%) rename modules/document-db/{database-accounts => database-account}/sql-databases/containers/README.md (100%) rename modules/document-db/{database-accounts => database-account}/sql-databases/containers/main.bicep (100%) rename modules/document-db/{database-accounts => database-account}/sql-databases/containers/main.json (100%) rename modules/document-db/{database-accounts => database-account}/sql-databases/containers/version.json (100%) rename modules/document-db/{database-accounts => database-account}/sql-databases/main.bicep (98%) rename modules/document-db/{database-accounts => database-account}/sql-databases/main.json (100%) rename modules/document-db/{database-accounts => database-account}/sql-databases/version.json (100%) rename modules/document-db/{database-accounts => database-account}/version.json (100%) rename modules/event-grid/{domains => domain}/.bicep/nested_roleAssignments.bicep (100%) rename modules/event-grid/{domains => domain}/.test/common/dependencies.bicep (100%) rename modules/event-grid/{domains => domain}/.test/common/main.test.bicep (100%) rename modules/event-grid/{domains => domain}/.test/main.test.bicep (100%) rename modules/event-grid/{domains => domain}/.test/min/main.test.bicep (100%) rename modules/event-grid/{domains => domain}/.test/pe/dependencies.bicep (100%) rename modules/event-grid/{domains => domain}/.test/pe/main.test.bicep (100%) rename modules/event-grid/{domains => domain}/README.md (99%) rename modules/event-grid/{domains => domain}/main.bicep (97%) rename modules/event-grid/{domains => domain}/main.json (100%) rename modules/event-grid/{domains => domain}/topics/README.md (100%) rename modules/event-grid/{domains => domain}/topics/main.bicep (100%) rename modules/event-grid/{domains => domain}/topics/main.json (100%) rename modules/event-grid/{domains => domain}/topics/version.json (100%) rename modules/event-grid/{domains => domain}/version.json (100%) rename modules/event-grid/{system-topics => system-topic}/.bicep/nested_roleAssignments.bicep (100%) rename modules/event-grid/{system-topics => system-topic}/.test/common/dependencies.bicep (100%) rename modules/event-grid/{system-topics => system-topic}/.test/common/main.test.bicep (100%) rename modules/event-grid/{system-topics => system-topic}/.test/main.test.bicep (100%) rename modules/event-grid/{system-topics => system-topic}/.test/min/dependencies.bicep (100%) rename modules/event-grid/{system-topics => system-topic}/.test/min/main.test.bicep (100%) rename modules/event-grid/{system-topics => system-topic}/README.md (99%) rename modules/event-grid/{system-topics => system-topic}/eventSubscriptions/README.md (100%) rename modules/event-grid/{system-topics => system-topic}/eventSubscriptions/main.bicep (100%) rename modules/event-grid/{system-topics => system-topic}/eventSubscriptions/main.json (100%) rename modules/event-grid/{system-topics => system-topic}/eventSubscriptions/version.json (100%) rename modules/event-grid/{system-topics => system-topic}/main.bicep (98%) rename modules/event-grid/{system-topics => system-topic}/main.json (100%) rename modules/event-grid/{system-topics => system-topic}/version.json (100%) rename modules/event-grid/{topics => topic}/.bicep/nested_roleAssignments.bicep (100%) rename modules/event-grid/{topics => topic}/.test/common/dependencies.bicep (100%) rename modules/event-grid/{topics => topic}/.test/common/main.test.bicep (100%) rename modules/event-grid/{topics => topic}/.test/main.test.bicep (100%) rename modules/event-grid/{topics => topic}/.test/min/main.test.bicep (100%) rename modules/event-grid/{topics => topic}/.test/pe/dependencies.bicep (100%) rename modules/event-grid/{topics => topic}/.test/pe/main.test.bicep (100%) rename modules/event-grid/{topics => topic}/README.md (99%) rename modules/event-grid/{topics => topic}/eventSubscriptions/README.md (100%) rename modules/event-grid/{topics => topic}/eventSubscriptions/main.bicep (100%) rename modules/event-grid/{topics => topic}/eventSubscriptions/main.json (100%) rename modules/event-grid/{topics => topic}/eventSubscriptions/version.json (100%) rename modules/event-grid/{topics => topic}/main.bicep (97%) rename modules/event-grid/{topics => topic}/main.json (100%) rename modules/event-grid/{topics => topic}/version.json (100%) rename modules/event-hub/{namespaces => namespace}/.bicep/nested_roleAssignments.bicep (100%) rename modules/event-hub/{namespaces => namespace}/.test/common/dependencies.bicep (100%) rename modules/event-hub/{namespaces => namespace}/.test/common/main.test.bicep (100%) rename modules/event-hub/{namespaces => namespace}/.test/encr/dependencies.bicep (100%) rename modules/event-hub/{namespaces => namespace}/.test/encr/main.test.bicep (100%) rename modules/event-hub/{namespaces => namespace}/.test/main.test.bicep (100%) rename modules/event-hub/{namespaces => namespace}/.test/min/main.test.bicep (100%) rename modules/event-hub/{namespaces => namespace}/.test/pe/dependencies.bicep (100%) rename modules/event-hub/{namespaces => namespace}/.test/pe/main.test.bicep (100%) rename modules/event-hub/{namespaces => namespace}/README.md (99%) rename modules/event-hub/{namespaces => namespace}/authorization-rules/README.md (100%) rename modules/event-hub/{namespaces => namespace}/authorization-rules/main.bicep (100%) rename modules/event-hub/{namespaces => namespace}/authorization-rules/main.json (100%) rename modules/event-hub/{namespaces => namespace}/authorization-rules/version.json (100%) rename modules/event-hub/{namespaces => namespace}/disaster-recovery-configs/README.md (100%) rename modules/event-hub/{namespaces => namespace}/disaster-recovery-configs/main.bicep (100%) rename modules/event-hub/{namespaces => namespace}/disaster-recovery-configs/main.json (100%) rename modules/event-hub/{namespaces => namespace}/disaster-recovery-configs/version.json (100%) rename modules/event-hub/{namespaces => namespace}/eventhubs/.bicep/nested_roleAssignments.bicep (100%) rename modules/event-hub/{namespaces => namespace}/eventhubs/README.md (100%) rename modules/event-hub/{namespaces => namespace}/eventhubs/authorization-rules/README.md (100%) rename modules/event-hub/{namespaces => namespace}/eventhubs/authorization-rules/main.bicep (100%) rename modules/event-hub/{namespaces => namespace}/eventhubs/authorization-rules/main.json (100%) rename modules/event-hub/{namespaces => namespace}/eventhubs/authorization-rules/version.json (100%) rename modules/event-hub/{namespaces => namespace}/eventhubs/consumergroups/README.md (100%) rename modules/event-hub/{namespaces => namespace}/eventhubs/consumergroups/main.bicep (100%) rename modules/event-hub/{namespaces => namespace}/eventhubs/consumergroups/main.json (100%) rename modules/event-hub/{namespaces => namespace}/eventhubs/consumergroups/version.json (100%) rename modules/event-hub/{namespaces => namespace}/eventhubs/main.bicep (97%) rename modules/event-hub/{namespaces => namespace}/eventhubs/main.json (100%) rename modules/event-hub/{namespaces => namespace}/eventhubs/version.json (100%) rename modules/event-hub/{namespaces => namespace}/main.bicep (97%) rename modules/event-hub/{namespaces => namespace}/main.json (100%) rename modules/event-hub/{namespaces => namespace}/network-rule-sets/README.md (100%) rename modules/event-hub/{namespaces => namespace}/network-rule-sets/main.bicep (100%) rename modules/event-hub/{namespaces => namespace}/network-rule-sets/main.json (100%) rename modules/event-hub/{namespaces => namespace}/network-rule-sets/version.json (100%) rename modules/event-hub/{namespaces => namespace}/version.json (100%) rename modules/health-bot/{health-bots => health-bot}/.bicep/nested_roleAssignments.bicep (100%) rename modules/health-bot/{health-bots => health-bot}/.test/common/dependencies.bicep (100%) rename modules/health-bot/{health-bots => health-bot}/.test/common/main.test.bicep (100%) rename modules/health-bot/{health-bots => health-bot}/.test/main.test.bicep (100%) rename modules/health-bot/{health-bots => health-bot}/.test/min/main.test.bicep (100%) rename modules/health-bot/{health-bots => health-bot}/README.md (98%) rename modules/health-bot/{health-bots => health-bot}/main.bicep (100%) rename modules/health-bot/{health-bots => health-bot}/main.json (100%) rename modules/health-bot/{health-bots => health-bot}/version.json (100%) rename modules/healthcare-apis/{workspaces => workspace}/.bicep/nested_roleAssignments.bicep (100%) rename modules/healthcare-apis/{workspaces => workspace}/.test/common/dependencies.bicep (100%) rename modules/healthcare-apis/{workspaces => workspace}/.test/common/main.test.bicep (100%) rename modules/healthcare-apis/{workspaces => workspace}/.test/main.test.bicep (100%) rename modules/healthcare-apis/{workspaces => workspace}/.test/min/main.test.bicep (100%) rename modules/healthcare-apis/{workspaces => workspace}/README.md (99%) rename modules/healthcare-apis/{workspaces => workspace}/dicomservices/README.md (100%) rename modules/healthcare-apis/{workspaces => workspace}/dicomservices/main.bicep (100%) rename modules/healthcare-apis/{workspaces => workspace}/dicomservices/main.json (100%) rename modules/healthcare-apis/{workspaces => workspace}/dicomservices/version.json (100%) rename modules/healthcare-apis/{workspaces => workspace}/fhirservices/.bicep/nested_roleAssignments.bicep (100%) rename modules/healthcare-apis/{workspaces => workspace}/fhirservices/README.md (100%) rename modules/healthcare-apis/{workspaces => workspace}/fhirservices/main.bicep (100%) rename modules/healthcare-apis/{workspaces => workspace}/fhirservices/main.json (100%) rename modules/healthcare-apis/{workspaces => workspace}/fhirservices/version.json (100%) rename modules/healthcare-apis/{workspaces => workspace}/iotconnectors/README.md (100%) rename modules/healthcare-apis/{workspaces => workspace}/iotconnectors/fhirdestinations/README.md (100%) rename modules/healthcare-apis/{workspaces => workspace}/iotconnectors/fhirdestinations/main.bicep (100%) rename modules/healthcare-apis/{workspaces => workspace}/iotconnectors/fhirdestinations/main.json (100%) rename modules/healthcare-apis/{workspaces => workspace}/iotconnectors/fhirdestinations/version.json (100%) rename modules/healthcare-apis/{workspaces => workspace}/iotconnectors/main.bicep (98%) rename modules/healthcare-apis/{workspaces => workspace}/iotconnectors/main.json (100%) rename modules/healthcare-apis/{workspaces => workspace}/iotconnectors/version.json (100%) rename modules/healthcare-apis/{workspaces => workspace}/main.bicep (97%) rename modules/healthcare-apis/{workspaces => workspace}/main.json (100%) rename modules/healthcare-apis/{workspaces => workspace}/version.json (100%) rename modules/insights/{action-groups => action-group}/.bicep/nested_roleAssignments.bicep (100%) rename modules/insights/{action-groups => action-group}/.test/common/dependencies.bicep (100%) rename modules/insights/{action-groups => action-group}/.test/common/main.test.bicep (100%) rename modules/insights/{action-groups => action-group}/.test/main.test.bicep (100%) rename modules/insights/{action-groups => action-group}/.test/min/main.test.bicep (100%) rename modules/insights/{action-groups => action-group}/README.md (98%) rename modules/insights/{action-groups => action-group}/main.bicep (100%) rename modules/insights/{action-groups => action-group}/main.json (100%) rename modules/insights/{action-groups => action-group}/version.json (100%) rename modules/insights/{activity-log-alerts => activity-log-alert}/.bicep/nested_roleAssignments.bicep (100%) rename modules/insights/{activity-log-alerts => activity-log-alert}/.test/common/dependencies.bicep (100%) rename modules/insights/{activity-log-alerts => activity-log-alert}/.test/common/main.test.bicep (100%) rename modules/insights/{activity-log-alerts => activity-log-alert}/.test/main.test.bicep (100%) rename modules/insights/{activity-log-alerts => activity-log-alert}/README.md (99%) rename modules/insights/{activity-log-alerts => activity-log-alert}/main.bicep (100%) rename modules/insights/{activity-log-alerts => activity-log-alert}/main.json (100%) rename modules/insights/{activity-log-alerts => activity-log-alert}/version.json (100%) rename modules/insights/{components => component}/.bicep/nested_roleAssignments.bicep (100%) rename modules/insights/{components => component}/.test/common/dependencies.bicep (100%) rename modules/insights/{components => component}/.test/common/main.test.bicep (100%) rename modules/insights/{components => component}/.test/main.test.bicep (100%) rename modules/insights/{components => component}/.test/min/dependencies.bicep (100%) rename modules/insights/{components => component}/.test/min/main.test.bicep (100%) rename modules/insights/{components => component}/README.md (98%) rename modules/insights/{components => component}/main.bicep (100%) rename modules/insights/{components => component}/main.json (100%) rename modules/insights/{components => component}/version.json (100%) rename modules/insights/{data-collection-endpoints => data-collection-endpoint}/.bicep/nested_roleAssignments.bicep (100%) rename modules/insights/{data-collection-endpoints => data-collection-endpoint}/.test/common/dependencies.bicep (100%) rename modules/insights/{data-collection-endpoints => data-collection-endpoint}/.test/common/main.test.bicep (100%) rename modules/insights/{data-collection-endpoints => data-collection-endpoint}/.test/main.test.bicep (100%) rename modules/insights/{data-collection-endpoints => data-collection-endpoint}/.test/min/main.test.bicep (100%) rename modules/insights/{data-collection-endpoints => data-collection-endpoint}/README.md (99%) rename modules/insights/{data-collection-endpoints => data-collection-endpoint}/main.bicep (100%) rename modules/insights/{data-collection-endpoints => data-collection-endpoint}/main.json (100%) rename modules/insights/{data-collection-endpoints => data-collection-endpoint}/version.json (100%) rename modules/insights/{data-collection-rules => data-collection-rule}/.bicep/nested_roleAssignments.bicep (100%) rename modules/insights/{data-collection-rules => data-collection-rule}/.test/customadv/dependencies.bicep (100%) rename modules/insights/{data-collection-rules => data-collection-rule}/.test/customadv/main.test.bicep (100%) rename modules/insights/{data-collection-rules => data-collection-rule}/.test/custombasic/dependencies.bicep (100%) rename modules/insights/{data-collection-rules => data-collection-rule}/.test/custombasic/main.test.bicep (100%) rename modules/insights/{data-collection-rules => data-collection-rule}/.test/customiis/dependencies.bicep (100%) rename modules/insights/{data-collection-rules => data-collection-rule}/.test/customiis/main.test.bicep (100%) rename modules/insights/{data-collection-rules => data-collection-rule}/.test/linux/dependencies.bicep (100%) rename modules/insights/{data-collection-rules => data-collection-rule}/.test/linux/main.test.bicep (100%) rename modules/insights/{data-collection-rules => data-collection-rule}/.test/main.test.bicep (100%) rename modules/insights/{data-collection-rules => data-collection-rule}/.test/min/main.test.bicep (100%) rename modules/insights/{data-collection-rules => data-collection-rule}/.test/windows/dependencies.bicep (100%) rename modules/insights/{data-collection-rules => data-collection-rule}/.test/windows/main.test.bicep (100%) rename modules/insights/{data-collection-rules => data-collection-rule}/README.md (98%) rename modules/insights/{data-collection-rules => data-collection-rule}/main.bicep (100%) rename modules/insights/{data-collection-rules => data-collection-rule}/main.json (100%) rename modules/insights/{data-collection-rules => data-collection-rule}/version.json (100%) rename modules/insights/{diagnostic-settings => diagnostic-setting}/.test/common/main.test.bicep (100%) rename modules/insights/{diagnostic-settings => diagnostic-setting}/.test/main.test.bicep (100%) rename modules/insights/{diagnostic-settings => diagnostic-setting}/README.md (98%) rename modules/insights/{diagnostic-settings => diagnostic-setting}/main.bicep (100%) rename modules/insights/{diagnostic-settings => diagnostic-setting}/main.json (100%) rename modules/insights/{diagnostic-settings => diagnostic-setting}/version.json (100%) rename modules/insights/{metric-alerts => metric-alert}/.bicep/nested_roleAssignments.bicep (100%) rename modules/insights/{metric-alerts => metric-alert}/.test/common/dependencies.bicep (100%) rename modules/insights/{metric-alerts => metric-alert}/.test/common/main.test.bicep (100%) rename modules/insights/{metric-alerts => metric-alert}/.test/main.test.bicep (100%) rename modules/insights/{metric-alerts => metric-alert}/README.md (99%) rename modules/insights/{metric-alerts => metric-alert}/main.bicep (100%) rename modules/insights/{metric-alerts => metric-alert}/main.json (100%) rename modules/insights/{metric-alerts => metric-alert}/version.json (100%) rename modules/insights/{private-link-scopes => private-link-scope}/.bicep/nested_roleAssignments.bicep (100%) rename modules/insights/{private-link-scopes => private-link-scope}/.test/common/dependencies.bicep (100%) rename modules/insights/{private-link-scopes => private-link-scope}/.test/common/main.test.bicep (100%) rename modules/insights/{private-link-scopes => private-link-scope}/.test/main.test.bicep (100%) rename modules/insights/{private-link-scopes => private-link-scope}/.test/min/main.test.bicep (100%) rename modules/insights/{private-link-scopes => private-link-scope}/README.md (98%) rename modules/insights/{private-link-scopes => private-link-scope}/main.bicep (96%) rename modules/insights/{private-link-scopes => private-link-scope}/main.json (100%) rename modules/insights/{private-link-scopes => private-link-scope}/scoped-resources/README.md (100%) rename modules/insights/{private-link-scopes => private-link-scope}/scoped-resources/main.bicep (100%) rename modules/insights/{private-link-scopes => private-link-scope}/scoped-resources/main.json (100%) rename modules/insights/{private-link-scopes => private-link-scope}/scoped-resources/version.json (100%) rename modules/insights/{private-link-scopes => private-link-scope}/version.json (100%) rename modules/insights/{scheduled-query-rules => scheduled-query-rule}/.bicep/nested_roleAssignments.bicep (100%) rename modules/insights/{scheduled-query-rules => scheduled-query-rule}/.test/common/dependencies.bicep (100%) rename modules/insights/{scheduled-query-rules => scheduled-query-rule}/.test/common/main.test.bicep (100%) rename modules/insights/{scheduled-query-rules => scheduled-query-rule}/.test/main.test.bicep (100%) rename modules/insights/{scheduled-query-rules => scheduled-query-rule}/README.md (99%) rename modules/insights/{scheduled-query-rules => scheduled-query-rule}/main.bicep (100%) rename modules/insights/{scheduled-query-rules => scheduled-query-rule}/main.json (100%) rename modules/insights/{scheduled-query-rules => scheduled-query-rule}/version.json (100%) rename modules/insights/{webtests => webtest}/.bicep/nested_roleAssignments.bicep (100%) rename modules/insights/{webtests => webtest}/.test/common/dependencies.bicep (100%) rename modules/insights/{webtests => webtest}/.test/common/main.test.bicep (100%) rename modules/insights/{webtests => webtest}/.test/main.test.bicep (100%) rename modules/insights/{webtests => webtest}/.test/min/dependencies.bicep (100%) rename modules/insights/{webtests => webtest}/.test/min/main.test.bicep (100%) rename modules/insights/{webtests => webtest}/README.md (98%) rename modules/insights/{webtests => webtest}/main.bicep (100%) rename modules/insights/{webtests => webtest}/main.json (100%) rename modules/insights/{webtests => webtest}/version.json (100%) rename modules/key-vault/{vaults => vault}/.bicep/nested_roleAssignments.bicep (100%) rename modules/key-vault/{vaults => vault}/.test/common/dependencies.bicep (100%) rename modules/key-vault/{vaults => vault}/.test/common/main.test.bicep (100%) rename modules/key-vault/{vaults => vault}/.test/main.test.bicep (100%) rename modules/key-vault/{vaults => vault}/.test/min/main.test.bicep (100%) rename modules/key-vault/{vaults => vault}/.test/pe/dependencies.bicep (100%) rename modules/key-vault/{vaults => vault}/.test/pe/main.test.bicep (100%) rename modules/key-vault/{vaults => vault}/README.md (99%) rename modules/key-vault/{vaults => vault}/access-policies/README.md (100%) rename modules/key-vault/{vaults => vault}/access-policies/main.bicep (100%) rename modules/key-vault/{vaults => vault}/access-policies/main.json (100%) rename modules/key-vault/{vaults => vault}/access-policies/version.json (100%) rename modules/key-vault/{vaults => vault}/keys/.bicep/nested_roleAssignments.bicep (100%) rename modules/key-vault/{vaults => vault}/keys/README.md (100%) rename modules/key-vault/{vaults => vault}/keys/main.bicep (100%) rename modules/key-vault/{vaults => vault}/keys/main.json (100%) rename modules/key-vault/{vaults => vault}/keys/version.json (100%) rename modules/key-vault/{vaults => vault}/main.bicep (97%) rename modules/key-vault/{vaults => vault}/main.json (100%) rename modules/key-vault/{vaults => vault}/secrets/.bicep/nested_roleAssignments.bicep (100%) rename modules/key-vault/{vaults => vault}/secrets/README.md (100%) rename modules/key-vault/{vaults => vault}/secrets/main.bicep (100%) rename modules/key-vault/{vaults => vault}/secrets/main.json (100%) rename modules/key-vault/{vaults => vault}/secrets/version.json (100%) rename modules/key-vault/{vaults => vault}/version.json (100%) rename modules/kubernetes-configuration/{extensions => extension}/.test/common/dependencies.bicep (100%) rename modules/kubernetes-configuration/{extensions => extension}/.test/common/main.test.bicep (100%) rename modules/kubernetes-configuration/{extensions => extension}/.test/main.test.bicep (100%) rename modules/kubernetes-configuration/{extensions => extension}/.test/min/dependencies.bicep (100%) rename modules/kubernetes-configuration/{extensions => extension}/.test/min/main.test.bicep (100%) rename modules/kubernetes-configuration/{extensions => extension}/README.md (98%) rename modules/kubernetes-configuration/{extensions => extension}/main.bicep (98%) rename modules/kubernetes-configuration/{extensions => extension}/main.json (100%) rename modules/kubernetes-configuration/{extensions => extension}/version.json (100%) rename modules/kubernetes-configuration/{flux-configurations => flux-configuration}/.test/common/dependencies.bicep (100%) rename modules/kubernetes-configuration/{flux-configurations => flux-configuration}/.test/common/main.test.bicep (100%) rename modules/kubernetes-configuration/{flux-configurations => flux-configuration}/.test/main.test.bicep (100%) rename modules/kubernetes-configuration/{flux-configurations => flux-configuration}/.test/min/dependencies.bicep (100%) rename modules/kubernetes-configuration/{flux-configurations => flux-configuration}/.test/min/main.test.bicep (100%) rename modules/kubernetes-configuration/{flux-configurations => flux-configuration}/README.md (99%) rename modules/kubernetes-configuration/{flux-configurations => flux-configuration}/main.bicep (100%) rename modules/kubernetes-configuration/{flux-configurations => flux-configuration}/main.json (100%) rename modules/kubernetes-configuration/{flux-configurations => flux-configuration}/version.json (100%) rename modules/logic/{workflows => workflow}/.bicep/nested_roleAssignments.bicep (100%) rename modules/logic/{workflows => workflow}/.test/common/dependencies.bicep (100%) rename modules/logic/{workflows => workflow}/.test/common/main.test.bicep (100%) rename modules/logic/{workflows => workflow}/.test/main.test.bicep (100%) rename modules/logic/{workflows => workflow}/README.md (99%) rename modules/logic/{workflows => workflow}/main.bicep (100%) rename modules/logic/{workflows => workflow}/main.json (100%) rename modules/logic/{workflows => workflow}/version.json (100%) rename modules/machine-learning-services/{workspaces => workspace}/.bicep/nested_roleAssignments.bicep (100%) rename modules/machine-learning-services/{workspaces => workspace}/.test/common/dependencies.bicep (100%) rename modules/machine-learning-services/{workspaces => workspace}/.test/common/main.test.bicep (100%) rename modules/machine-learning-services/{workspaces => workspace}/.test/encr/dependencies.bicep (100%) rename modules/machine-learning-services/{workspaces => workspace}/.test/encr/main.test.bicep (100%) rename modules/machine-learning-services/{workspaces => workspace}/.test/main.test.bicep (100%) rename modules/machine-learning-services/{workspaces => workspace}/.test/min/dependencies.bicep (100%) rename modules/machine-learning-services/{workspaces => workspace}/.test/min/main.test.bicep (100%) rename modules/machine-learning-services/{workspaces => workspace}/README.md (99%) rename modules/machine-learning-services/{workspaces => workspace}/computes/README.md (100%) rename modules/machine-learning-services/{workspaces => workspace}/computes/main.bicep (100%) rename modules/machine-learning-services/{workspaces => workspace}/computes/main.json (100%) rename modules/machine-learning-services/{workspaces => workspace}/computes/version.json (100%) rename modules/machine-learning-services/{workspaces => workspace}/main.bicep (99%) rename modules/machine-learning-services/{workspaces => workspace}/main.json (100%) rename modules/machine-learning-services/{workspaces => workspace}/version.json (100%) rename modules/maintenance/{maintenance-configurations => maintenance-configuration}/.bicep/nested_roleAssignments.bicep (100%) rename modules/maintenance/{maintenance-configurations => maintenance-configuration}/.test/common/dependencies.bicep (100%) rename modules/maintenance/{maintenance-configurations => maintenance-configuration}/.test/common/main.test.bicep (100%) rename modules/maintenance/{maintenance-configurations => maintenance-configuration}/.test/main.test.bicep (100%) rename modules/maintenance/{maintenance-configurations => maintenance-configuration}/.test/min/main.test.bicep (100%) rename modules/maintenance/{maintenance-configurations => maintenance-configuration}/README.md (99%) rename modules/maintenance/{maintenance-configurations => maintenance-configuration}/main.bicep (100%) rename modules/maintenance/{maintenance-configurations => maintenance-configuration}/main.json (100%) rename modules/maintenance/{maintenance-configurations => maintenance-configuration}/version.json (100%) rename modules/managed-identity/{user-assigned-identities => user-assigned-identity}/.bicep/nested_roleAssignments.bicep (100%) rename modules/managed-identity/{user-assigned-identities => user-assigned-identity}/.test/common/dependencies.bicep (100%) rename modules/managed-identity/{user-assigned-identities => user-assigned-identity}/.test/common/main.test.bicep (100%) rename modules/managed-identity/{user-assigned-identities => user-assigned-identity}/.test/main.test.bicep (100%) rename modules/managed-identity/{user-assigned-identities => user-assigned-identity}/README.md (99%) rename modules/managed-identity/{user-assigned-identities => user-assigned-identity}/main.bicep (100%) rename modules/managed-identity/{user-assigned-identities => user-assigned-identity}/main.json (100%) rename modules/managed-identity/{user-assigned-identities => user-assigned-identity}/version.json (100%) rename modules/managed-services/{registration-definitions => registration-definition}/.bicep/nested_registrationAssignment.bicep (100%) rename modules/managed-services/{registration-definitions => registration-definition}/.test/common/main.test.bicep (100%) rename modules/managed-services/{registration-definitions => registration-definition}/.test/main.test.bicep (100%) rename modules/managed-services/{registration-definitions => registration-definition}/.test/rg/main.test.bicep (100%) rename modules/managed-services/{registration-definitions => registration-definition}/README.md (99%) rename modules/managed-services/{registration-definitions => registration-definition}/main.bicep (100%) rename modules/managed-services/{registration-definitions => registration-definition}/main.json (100%) rename modules/managed-services/{registration-definitions => registration-definition}/version.json (100%) rename modules/management/{management-groups => management-group}/.test/common/main.test.bicep (100%) rename modules/management/{management-groups => management-group}/.test/main.test.bicep (100%) rename modules/management/{management-groups => management-group}/.test/min/main.test.bicep (100%) rename modules/management/{management-groups => management-group}/README.md (97%) rename modules/management/{management-groups => management-group}/main.bicep (100%) rename modules/management/{management-groups => management-group}/main.json (100%) rename modules/management/{management-groups => management-group}/version.json (100%) rename modules/net-app/{net-app-accounts => net-app-account}/.bicep/nested_roleAssignments.bicep (100%) rename modules/net-app/{net-app-accounts => net-app-account}/.test/main.test.bicep (100%) rename modules/net-app/{net-app-accounts => net-app-account}/.test/min/main.test.bicep (100%) rename modules/net-app/{net-app-accounts => net-app-account}/.test/nfs3/dependencies.bicep (100%) rename modules/net-app/{net-app-accounts => net-app-account}/.test/nfs3/main.test.bicep (100%) rename modules/net-app/{net-app-accounts => net-app-account}/.test/nfs41/dependencies.bicep (100%) rename modules/net-app/{net-app-accounts => net-app-account}/.test/nfs41/main.test.bicep (100%) rename modules/net-app/{net-app-accounts => net-app-account}/README.md (99%) rename modules/net-app/{net-app-accounts => net-app-account}/capacity-pools/.bicep/nested_roleAssignments.bicep (100%) rename modules/net-app/{net-app-accounts => net-app-account}/capacity-pools/README.md (100%) rename modules/net-app/{net-app-accounts => net-app-account}/capacity-pools/main.bicep (98%) rename modules/net-app/{net-app-accounts => net-app-account}/capacity-pools/main.json (100%) rename modules/net-app/{net-app-accounts => net-app-account}/capacity-pools/version.json (100%) rename modules/net-app/{net-app-accounts => net-app-account}/capacity-pools/volumes/.bicep/nested_roleAssignments.bicep (100%) rename modules/net-app/{net-app-accounts => net-app-account}/capacity-pools/volumes/README.md (100%) rename modules/net-app/{net-app-accounts => net-app-account}/capacity-pools/volumes/main.bicep (100%) rename modules/net-app/{net-app-accounts => net-app-account}/capacity-pools/volumes/main.json (100%) rename modules/net-app/{net-app-accounts => net-app-account}/capacity-pools/volumes/version.json (100%) rename modules/net-app/{net-app-accounts => net-app-account}/main.bicep (98%) rename modules/net-app/{net-app-accounts => net-app-account}/main.json (100%) rename modules/net-app/{net-app-accounts => net-app-account}/version.json (100%) rename modules/network/{application-gateway-web-application-firewall-policies => application-gateway-web-application-firewall-policy}/.test/common/main.test.bicep (100%) rename modules/network/{application-gateway-web-application-firewall-policies => application-gateway-web-application-firewall-policy}/.test/main.test.bicep (100%) rename modules/network/{application-gateway-web-application-firewall-policies => application-gateway-web-application-firewall-policy}/README.md (98%) rename modules/network/{application-gateway-web-application-firewall-policies => application-gateway-web-application-firewall-policy}/main.bicep (100%) rename modules/network/{application-gateway-web-application-firewall-policies => application-gateway-web-application-firewall-policy}/main.json (100%) rename modules/network/{application-gateway-web-application-firewall-policies => application-gateway-web-application-firewall-policy}/version.json (100%) rename modules/network/{application-gateways => application-gateway}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{application-gateways => application-gateway}/.test/common/dependencies.bicep (100%) rename modules/network/{application-gateways => application-gateway}/.test/common/main.test.bicep (100%) rename modules/network/{application-gateways => application-gateway}/.test/main.test.bicep (100%) rename modules/network/{application-gateways => application-gateway}/README.md (99%) rename modules/network/{application-gateways => application-gateway}/main.bicep (100%) rename modules/network/{application-gateways => application-gateway}/main.json (100%) rename modules/network/{application-gateways => application-gateway}/version.json (100%) rename modules/network/{application-security-groups => application-security-group}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{application-security-groups => application-security-group}/.test/common/dependencies.bicep (100%) rename modules/network/{application-security-groups => application-security-group}/.test/common/main.test.bicep (100%) rename modules/network/{application-security-groups => application-security-group}/.test/main.test.bicep (100%) rename modules/network/{application-security-groups => application-security-group}/README.md (99%) rename modules/network/{application-security-groups => application-security-group}/main.bicep (100%) rename modules/network/{application-security-groups => application-security-group}/main.json (100%) rename modules/network/{application-security-groups => application-security-group}/version.json (100%) rename modules/network/{azure-firewalls => azure-firewall}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{azure-firewalls => azure-firewall}/.test/addpip/dependencies.bicep (100%) rename modules/network/{azure-firewalls => azure-firewall}/.test/addpip/main.test.bicep (100%) rename modules/network/{azure-firewalls => azure-firewall}/.test/common/dependencies.bicep (100%) rename modules/network/{azure-firewalls => azure-firewall}/.test/common/main.test.bicep (100%) rename modules/network/{azure-firewalls => azure-firewall}/.test/custompip/dependencies.bicep (100%) rename modules/network/{azure-firewalls => azure-firewall}/.test/custompip/main.test.bicep (100%) rename modules/network/{azure-firewalls => azure-firewall}/.test/hubcommon/dependencies.bicep (100%) rename modules/network/{azure-firewalls => azure-firewall}/.test/hubcommon/main.test.bicep (100%) rename modules/network/{azure-firewalls => azure-firewall}/.test/hubmin/dependencies.bicep (100%) rename modules/network/{azure-firewalls => azure-firewall}/.test/hubmin/main.test.bicep (100%) rename modules/network/{azure-firewalls => azure-firewall}/.test/main.test.bicep (100%) rename modules/network/{azure-firewalls => azure-firewall}/.test/min/dependencies.bicep (100%) rename modules/network/{azure-firewalls => azure-firewall}/.test/min/main.test.bicep (100%) rename modules/network/{azure-firewalls => azure-firewall}/README.md (98%) rename modules/network/{azure-firewalls => azure-firewall}/main.bicep (98%) rename modules/network/{azure-firewalls => azure-firewall}/main.json (100%) rename modules/network/{azure-firewalls => azure-firewall}/version.json (100%) rename modules/network/{bastion-hosts => bastion-host}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{bastion-hosts => bastion-host}/.test/common/dependencies.bicep (100%) rename modules/network/{bastion-hosts => bastion-host}/.test/common/main.test.bicep (100%) rename modules/network/{bastion-hosts => bastion-host}/.test/custompip/dependencies.bicep (100%) rename modules/network/{bastion-hosts => bastion-host}/.test/custompip/main.test.bicep (100%) rename modules/network/{bastion-hosts => bastion-host}/.test/main.test.bicep (100%) rename modules/network/{bastion-hosts => bastion-host}/.test/min/dependencies.bicep (100%) rename modules/network/{bastion-hosts => bastion-host}/.test/min/main.test.bicep (100%) rename modules/network/{bastion-hosts => bastion-host}/README.md (98%) rename modules/network/{bastion-hosts => bastion-host}/main.bicep (98%) rename modules/network/{bastion-hosts => bastion-host}/main.json (100%) rename modules/network/{bastion-hosts => bastion-host}/version.json (100%) rename modules/network/{connections => connection}/.test/main.test.bicep (100%) rename modules/network/{connections => connection}/.test/vnet2vnet/dependencies.bicep (100%) rename modules/network/{connections => connection}/.test/vnet2vnet/main.test.bicep (100%) rename modules/network/{connections => connection}/README.md (99%) rename modules/network/{connections => connection}/main.bicep (100%) rename modules/network/{connections => connection}/main.json (100%) rename modules/network/{connections => connection}/version.json (100%) rename modules/network/{ddos-protection-plans => ddos-protection-plan}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{ddos-protection-plans => ddos-protection-plan}/.test/common/dependencies.bicep (100%) rename modules/network/{ddos-protection-plans => ddos-protection-plan}/.test/common/main.test.bicep (100%) rename modules/network/{ddos-protection-plans => ddos-protection-plan}/.test/main.test.bicep (100%) rename modules/network/{ddos-protection-plans => ddos-protection-plan}/.test/min/main.test.bicep (100%) rename modules/network/{ddos-protection-plans => ddos-protection-plan}/README.md (97%) rename modules/network/{ddos-protection-plans => ddos-protection-plan}/main.bicep (100%) rename modules/network/{ddos-protection-plans => ddos-protection-plan}/main.json (100%) rename modules/network/{ddos-protection-plans => ddos-protection-plan}/version.json (100%) rename modules/network/{dns-forwarding-rulesets => dns-forwarding-ruleset}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{dns-forwarding-rulesets => dns-forwarding-ruleset}/.test/common/dependencies.bicep (100%) rename modules/network/{dns-forwarding-rulesets => dns-forwarding-ruleset}/.test/common/main.test.bicep (100%) rename modules/network/{dns-forwarding-rulesets => dns-forwarding-ruleset}/.test/main.test.bicep (100%) rename modules/network/{dns-forwarding-rulesets => dns-forwarding-ruleset}/.test/min/dependencies.bicep (100%) rename modules/network/{dns-forwarding-rulesets => dns-forwarding-ruleset}/.test/min/main.test.bicep (100%) rename modules/network/{dns-forwarding-rulesets => dns-forwarding-ruleset}/README.md (98%) rename modules/network/{dns-forwarding-rulesets => dns-forwarding-ruleset}/forwarding-rules/README.md (100%) rename modules/network/{dns-forwarding-rulesets => dns-forwarding-ruleset}/forwarding-rules/main.bicep (100%) rename modules/network/{dns-forwarding-rulesets => dns-forwarding-ruleset}/forwarding-rules/main.json (100%) rename modules/network/{dns-forwarding-rulesets => dns-forwarding-ruleset}/forwarding-rules/version.json (100%) rename modules/network/{dns-forwarding-rulesets => dns-forwarding-ruleset}/main.bicep (96%) rename modules/network/{dns-forwarding-rulesets => dns-forwarding-ruleset}/main.json (100%) rename modules/network/{dns-forwarding-rulesets => dns-forwarding-ruleset}/version.json (100%) rename modules/network/{dns-forwarding-rulesets => dns-forwarding-ruleset}/virtual-network-links/README.md (100%) rename modules/network/{dns-forwarding-rulesets => dns-forwarding-ruleset}/virtual-network-links/main.bicep (100%) rename modules/network/{dns-forwarding-rulesets => dns-forwarding-ruleset}/virtual-network-links/main.json (100%) rename modules/network/{dns-forwarding-rulesets => dns-forwarding-ruleset}/virtual-network-links/version.json (100%) rename modules/network/{dns-resolvers => dns-resolver}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{dns-resolvers => dns-resolver}/.test/common/dependencies.bicep (100%) rename modules/network/{dns-resolvers => dns-resolver}/.test/common/main.test.bicep (100%) rename modules/network/{dns-resolvers => dns-resolver}/.test/main.test.bicep (100%) rename modules/network/{dns-resolvers => dns-resolver}/README.md (99%) rename modules/network/{dns-resolvers => dns-resolver}/main.bicep (100%) rename modules/network/{dns-resolvers => dns-resolver}/main.json (100%) rename modules/network/{dns-resolvers => dns-resolver}/version.json (100%) rename modules/network/{dns-zones => dns-zone}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{dns-zones => dns-zone}/.test/common/dependencies.bicep (100%) rename modules/network/{dns-zones => dns-zone}/.test/common/main.test.bicep (100%) rename modules/network/{dns-zones => dns-zone}/.test/main.test.bicep (100%) rename modules/network/{dns-zones => dns-zone}/.test/min/main.test.bicep (100%) rename modules/network/{dns-zones => dns-zone}/README.md (99%) rename modules/network/{dns-zones => dns-zone}/a/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{dns-zones => dns-zone}/a/README.md (100%) rename modules/network/{dns-zones => dns-zone}/a/main.bicep (100%) rename modules/network/{dns-zones => dns-zone}/a/main.json (100%) rename modules/network/{dns-zones => dns-zone}/a/version.json (100%) rename modules/network/{dns-zones => dns-zone}/aaaa/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{dns-zones => dns-zone}/aaaa/README.md (100%) rename modules/network/{dns-zones => dns-zone}/aaaa/main.bicep (100%) rename modules/network/{dns-zones => dns-zone}/aaaa/main.json (100%) rename modules/network/{dns-zones => dns-zone}/aaaa/version.json (100%) rename modules/network/{dns-zones => dns-zone}/caa/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{dns-zones => dns-zone}/caa/README.md (100%) rename modules/network/{dns-zones => dns-zone}/caa/main.bicep (100%) rename modules/network/{dns-zones => dns-zone}/caa/main.json (100%) rename modules/network/{dns-zones => dns-zone}/caa/version.json (100%) rename modules/network/{dns-zones => dns-zone}/cname/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{dns-zones => dns-zone}/cname/README.md (100%) rename modules/network/{dns-zones => dns-zone}/cname/main.bicep (100%) rename modules/network/{dns-zones => dns-zone}/cname/main.json (100%) rename modules/network/{dns-zones => dns-zone}/cname/version.json (100%) rename modules/network/{dns-zones => dns-zone}/main.bicep (100%) rename modules/network/{dns-zones => dns-zone}/main.json (100%) rename modules/network/{dns-zones => dns-zone}/mx/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{dns-zones => dns-zone}/mx/README.md (100%) rename modules/network/{dns-zones => dns-zone}/mx/main.bicep (100%) rename modules/network/{dns-zones => dns-zone}/mx/main.json (100%) rename modules/network/{dns-zones => dns-zone}/mx/version.json (100%) rename modules/network/{dns-zones => dns-zone}/ns/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{dns-zones => dns-zone}/ns/README.md (100%) rename modules/network/{dns-zones => dns-zone}/ns/main.bicep (100%) rename modules/network/{dns-zones => dns-zone}/ns/main.json (100%) rename modules/network/{dns-zones => dns-zone}/ns/version.json (100%) rename modules/network/{dns-zones => dns-zone}/ptr/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{dns-zones => dns-zone}/ptr/README.md (100%) rename modules/network/{dns-zones => dns-zone}/ptr/main.bicep (100%) rename modules/network/{dns-zones => dns-zone}/ptr/main.json (100%) rename modules/network/{dns-zones => dns-zone}/ptr/version.json (100%) rename modules/network/{dns-zones => dns-zone}/soa/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{dns-zones => dns-zone}/soa/README.md (100%) rename modules/network/{dns-zones => dns-zone}/soa/main.bicep (100%) rename modules/network/{dns-zones => dns-zone}/soa/main.json (100%) rename modules/network/{dns-zones => dns-zone}/soa/version.json (100%) rename modules/network/{dns-zones => dns-zone}/srv/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{dns-zones => dns-zone}/srv/README.md (100%) rename modules/network/{dns-zones => dns-zone}/srv/main.bicep (100%) rename modules/network/{dns-zones => dns-zone}/srv/main.json (100%) rename modules/network/{dns-zones => dns-zone}/srv/version.json (100%) rename modules/network/{dns-zones => dns-zone}/txt/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{dns-zones => dns-zone}/txt/README.md (100%) rename modules/network/{dns-zones => dns-zone}/txt/main.bicep (100%) rename modules/network/{dns-zones => dns-zone}/txt/main.json (100%) rename modules/network/{dns-zones => dns-zone}/txt/version.json (100%) rename modules/network/{dns-zones => dns-zone}/version.json (100%) rename modules/network/{express-route-circuits => express-route-circuit}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{express-route-circuits => express-route-circuit}/.test/common/dependencies.bicep (100%) rename modules/network/{express-route-circuits => express-route-circuit}/.test/common/main.test.bicep (100%) rename modules/network/{express-route-circuits => express-route-circuit}/.test/main.test.bicep (100%) rename modules/network/{express-route-circuits => express-route-circuit}/.test/min/main.test.bicep (100%) rename modules/network/{express-route-circuits => express-route-circuit}/README.md (98%) rename modules/network/{express-route-circuits => express-route-circuit}/main.bicep (100%) rename modules/network/{express-route-circuits => express-route-circuit}/main.json (100%) rename modules/network/{express-route-circuits => express-route-circuit}/version.json (100%) rename modules/network/{firewall-policies => firewall-policy}/.test/common/main.test.bicep (100%) rename modules/network/{firewall-policies => firewall-policy}/.test/main.test.bicep (100%) rename modules/network/{firewall-policies => firewall-policy}/.test/min/main.test.bicep (100%) rename modules/network/{firewall-policies => firewall-policy}/README.md (98%) rename modules/network/{firewall-policies => firewall-policy}/main.bicep (98%) rename modules/network/{firewall-policies => firewall-policy}/main.json (100%) rename modules/network/{firewall-policies => firewall-policy}/rule-collection-groups/README.md (100%) rename modules/network/{firewall-policies => firewall-policy}/rule-collection-groups/main.bicep (100%) rename modules/network/{firewall-policies => firewall-policy}/rule-collection-groups/main.json (100%) rename modules/network/{firewall-policies => firewall-policy}/rule-collection-groups/version.json (100%) rename modules/network/{firewall-policies => firewall-policy}/version.json (100%) rename modules/network/{front-doors => front-door}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{front-doors => front-door}/.test/common/dependencies.bicep (100%) rename modules/network/{front-doors => front-door}/.test/common/main.test.bicep (100%) rename modules/network/{front-doors => front-door}/.test/main.test.bicep (100%) rename modules/network/{front-doors => front-door}/.test/min/main.test.bicep (100%) rename modules/network/{front-doors => front-door}/README.md (99%) rename modules/network/{front-doors => front-door}/main.bicep (100%) rename modules/network/{front-doors => front-door}/main.json (100%) rename modules/network/{front-doors => front-door}/version.json (100%) rename modules/network/{ip-groups => ip-group}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{ip-groups => ip-group}/.test/common/dependencies.bicep (100%) rename modules/network/{ip-groups => ip-group}/.test/common/main.test.bicep (100%) rename modules/network/{ip-groups => ip-group}/.test/main.test.bicep (100%) rename modules/network/{ip-groups => ip-group}/.test/min/main.test.bicep (100%) rename modules/network/{ip-groups => ip-group}/README.md (98%) rename modules/network/{ip-groups => ip-group}/main.bicep (100%) rename modules/network/{ip-groups => ip-group}/main.json (100%) rename modules/network/{ip-groups => ip-group}/version.json (100%) rename modules/network/{load-balancers => load-balancer}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{load-balancers => load-balancer}/.test/common/dependencies.bicep (100%) rename modules/network/{load-balancers => load-balancer}/.test/common/main.test.bicep (100%) rename modules/network/{load-balancers => load-balancer}/.test/internal/dependencies.bicep (100%) rename modules/network/{load-balancers => load-balancer}/.test/internal/main.test.bicep (100%) rename modules/network/{load-balancers => load-balancer}/.test/main.test.bicep (100%) rename modules/network/{load-balancers => load-balancer}/.test/min/dependencies.bicep (100%) rename modules/network/{load-balancers => load-balancer}/.test/min/main.test.bicep (100%) rename modules/network/{load-balancers => load-balancer}/README.md (99%) rename modules/network/{load-balancers => load-balancer}/backend-address-pools/README.md (100%) rename modules/network/{load-balancers => load-balancer}/backend-address-pools/main.bicep (100%) rename modules/network/{load-balancers => load-balancer}/backend-address-pools/main.json (100%) rename modules/network/{load-balancers => load-balancer}/backend-address-pools/version.json (100%) rename modules/network/{load-balancers => load-balancer}/inbound-nat-rules/README.md (100%) rename modules/network/{load-balancers => load-balancer}/inbound-nat-rules/main.bicep (100%) rename modules/network/{load-balancers => load-balancer}/inbound-nat-rules/main.json (100%) rename modules/network/{load-balancers => load-balancer}/inbound-nat-rules/version.json (100%) rename modules/network/{load-balancers => load-balancer}/main.bicep (98%) rename modules/network/{load-balancers => load-balancer}/main.json (100%) rename modules/network/{load-balancers => load-balancer}/version.json (100%) rename modules/network/{local-network-gateways => local-network-gateway}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{local-network-gateways => local-network-gateway}/.test/common/dependencies.bicep (100%) rename modules/network/{local-network-gateways => local-network-gateway}/.test/common/main.test.bicep (100%) rename modules/network/{local-network-gateways => local-network-gateway}/.test/main.test.bicep (100%) rename modules/network/{local-network-gateways => local-network-gateway}/.test/min/main.test.bicep (100%) rename modules/network/{local-network-gateways => local-network-gateway}/README.md (98%) rename modules/network/{local-network-gateways => local-network-gateway}/main.bicep (100%) rename modules/network/{local-network-gateways => local-network-gateway}/main.json (100%) rename modules/network/{local-network-gateways => local-network-gateway}/version.json (100%) rename modules/network/{nat-gateways => nat-gateway}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{nat-gateways => nat-gateway}/.test/common/dependencies.bicep (100%) rename modules/network/{nat-gateways => nat-gateway}/.test/common/main.test.bicep (100%) rename modules/network/{nat-gateways => nat-gateway}/.test/main.test.bicep (100%) rename modules/network/{nat-gateways => nat-gateway}/README.md (99%) rename modules/network/{nat-gateways => nat-gateway}/main.bicep (98%) rename modules/network/{nat-gateways => nat-gateway}/main.json (100%) rename modules/network/{nat-gateways => nat-gateway}/version.json (100%) rename modules/network/{network-interfaces => network-interface}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{network-interfaces => network-interface}/.test/common/dependencies.bicep (100%) rename modules/network/{network-interfaces => network-interface}/.test/common/main.test.bicep (100%) rename modules/network/{network-interfaces => network-interface}/.test/main.test.bicep (100%) rename modules/network/{network-interfaces => network-interface}/.test/min/dependencies.bicep (100%) rename modules/network/{network-interfaces => network-interface}/.test/min/main.test.bicep (100%) rename modules/network/{network-interfaces => network-interface}/README.md (98%) rename modules/network/{network-interfaces => network-interface}/main.bicep (100%) rename modules/network/{network-interfaces => network-interface}/main.json (100%) rename modules/network/{network-interfaces => network-interface}/version.json (100%) rename modules/network/{network-managers => network-manager}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{network-managers => network-manager}/.test/common/dependencies.bicep (100%) rename modules/network/{network-managers => network-manager}/.test/common/main.test.bicep (100%) rename modules/network/{network-managers => network-manager}/.test/main.test.bicep (100%) rename modules/network/{network-managers => network-manager}/README.md (99%) rename modules/network/{network-managers => network-manager}/connectivity-configurations/README.md (100%) rename modules/network/{network-managers => network-manager}/connectivity-configurations/main.bicep (100%) rename modules/network/{network-managers => network-manager}/connectivity-configurations/main.json (100%) rename modules/network/{network-managers => network-manager}/connectivity-configurations/version.json (100%) rename modules/network/{network-managers => network-manager}/main.bicep (94%) rename modules/network/{network-managers => network-manager}/main.json (100%) rename modules/network/{network-managers => network-manager}/network-groups/README.md (100%) rename modules/network/{network-managers => network-manager}/network-groups/main.bicep (95%) rename modules/network/{network-managers => network-manager}/network-groups/main.json (100%) rename modules/network/{network-managers => network-manager}/network-groups/static-members/README.md (100%) rename modules/network/{network-managers => network-manager}/network-groups/static-members/main.bicep (100%) rename modules/network/{network-managers => network-manager}/network-groups/static-members/main.json (100%) rename modules/network/{network-managers => network-manager}/network-groups/static-members/version.json (100%) rename modules/network/{network-managers => network-manager}/network-groups/version.json (100%) rename modules/network/{network-managers => network-manager}/scope-connections/README.md (100%) rename modules/network/{network-managers => network-manager}/scope-connections/main.bicep (100%) rename modules/network/{network-managers => network-manager}/scope-connections/main.json (100%) rename modules/network/{network-managers => network-manager}/scope-connections/version.json (100%) rename modules/network/{network-managers => network-manager}/security-admin-configurations/README.md (100%) rename modules/network/{network-managers => network-manager}/security-admin-configurations/main.bicep (97%) rename modules/network/{network-managers => network-manager}/security-admin-configurations/main.json (100%) rename modules/network/{network-managers => network-manager}/security-admin-configurations/rule-collections/README.md (100%) rename modules/network/{network-managers => network-manager}/security-admin-configurations/rule-collections/main.bicep (97%) rename modules/network/{network-managers => network-manager}/security-admin-configurations/rule-collections/main.json (100%) rename modules/network/{network-managers => network-manager}/security-admin-configurations/rule-collections/rules/README.md (100%) rename modules/network/{network-managers => network-manager}/security-admin-configurations/rule-collections/rules/main.bicep (100%) rename modules/network/{network-managers => network-manager}/security-admin-configurations/rule-collections/rules/main.json (100%) rename modules/network/{network-managers => network-manager}/security-admin-configurations/rule-collections/rules/version.json (100%) rename modules/network/{network-managers => network-manager}/security-admin-configurations/rule-collections/version.json (100%) rename modules/network/{network-managers => network-manager}/security-admin-configurations/version.json (100%) rename modules/network/{network-managers => network-manager}/version.json (100%) rename modules/network/{network-security-groups => network-security-group}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{network-security-groups => network-security-group}/.test/common/dependencies.bicep (100%) rename modules/network/{network-security-groups => network-security-group}/.test/common/main.test.bicep (100%) rename modules/network/{network-security-groups => network-security-group}/.test/main.test.bicep (100%) rename modules/network/{network-security-groups => network-security-group}/.test/min/main.test.bicep (100%) rename modules/network/{network-security-groups => network-security-group}/README.md (98%) rename modules/network/{network-security-groups => network-security-group}/main.bicep (98%) rename modules/network/{network-security-groups => network-security-group}/main.json (100%) rename modules/network/{network-security-groups => network-security-group}/security-rules/README.md (100%) rename modules/network/{network-security-groups => network-security-group}/security-rules/main.bicep (100%) rename modules/network/{network-security-groups => network-security-group}/security-rules/main.json (100%) rename modules/network/{network-security-groups => network-security-group}/security-rules/version.json (100%) rename modules/network/{network-security-groups => network-security-group}/version.json (100%) rename modules/network/{network-watchers => network-watcher}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{network-watchers => network-watcher}/.test/common/dependencies.bicep (100%) rename modules/network/{network-watchers => network-watcher}/.test/common/main.test.bicep (100%) rename modules/network/{network-watchers => network-watcher}/.test/main.test.bicep (100%) rename modules/network/{network-watchers => network-watcher}/.test/min/main.test.bicep (100%) rename modules/network/{network-watchers => network-watcher}/README.md (98%) rename modules/network/{network-watchers => network-watcher}/connection-monitors/README.md (100%) rename modules/network/{network-watchers => network-watcher}/connection-monitors/main.bicep (100%) rename modules/network/{network-watchers => network-watcher}/connection-monitors/main.json (100%) rename modules/network/{network-watchers => network-watcher}/connection-monitors/version.json (100%) rename modules/network/{network-watchers => network-watcher}/flow-logs/README.md (100%) rename modules/network/{network-watchers => network-watcher}/flow-logs/main.bicep (100%) rename modules/network/{network-watchers => network-watcher}/flow-logs/main.json (100%) rename modules/network/{network-watchers => network-watcher}/flow-logs/version.json (100%) rename modules/network/{network-watchers => network-watcher}/main.bicep (95%) rename modules/network/{network-watchers => network-watcher}/main.json (100%) rename modules/network/{network-watchers => network-watcher}/version.json (100%) rename modules/network/{private-dns-zones => private-dns-zone}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/.test/common/dependencies.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/.test/common/main.test.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/.test/main.test.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/.test/min/main.test.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/README.md (99%) rename modules/network/{private-dns-zones => private-dns-zone}/a/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/a/README.md (100%) rename modules/network/{private-dns-zones => private-dns-zone}/a/main.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/a/main.json (100%) rename modules/network/{private-dns-zones => private-dns-zone}/a/version.json (100%) rename modules/network/{private-dns-zones => private-dns-zone}/aaaa/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/aaaa/README.md (100%) rename modules/network/{private-dns-zones => private-dns-zone}/aaaa/main.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/aaaa/main.json (100%) rename modules/network/{private-dns-zones => private-dns-zone}/aaaa/version.json (100%) rename modules/network/{private-dns-zones => private-dns-zone}/cname/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/cname/README.md (100%) rename modules/network/{private-dns-zones => private-dns-zone}/cname/main.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/cname/main.json (100%) rename modules/network/{private-dns-zones => private-dns-zone}/cname/version.json (100%) rename modules/network/{private-dns-zones => private-dns-zone}/main.bicep (98%) rename modules/network/{private-dns-zones => private-dns-zone}/main.json (100%) rename modules/network/{private-dns-zones => private-dns-zone}/mx/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/mx/README.md (100%) rename modules/network/{private-dns-zones => private-dns-zone}/mx/main.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/mx/main.json (100%) rename modules/network/{private-dns-zones => private-dns-zone}/mx/version.json (100%) rename modules/network/{private-dns-zones => private-dns-zone}/ptr/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/ptr/README.md (100%) rename modules/network/{private-dns-zones => private-dns-zone}/ptr/main.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/ptr/main.json (100%) rename modules/network/{private-dns-zones => private-dns-zone}/ptr/version.json (100%) rename modules/network/{private-dns-zones => private-dns-zone}/soa/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/soa/README.md (100%) rename modules/network/{private-dns-zones => private-dns-zone}/soa/main.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/soa/main.json (100%) rename modules/network/{private-dns-zones => private-dns-zone}/soa/version.json (100%) rename modules/network/{private-dns-zones => private-dns-zone}/srv/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/srv/README.md (100%) rename modules/network/{private-dns-zones => private-dns-zone}/srv/main.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/srv/main.json (100%) rename modules/network/{private-dns-zones => private-dns-zone}/srv/version.json (100%) rename modules/network/{private-dns-zones => private-dns-zone}/txt/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/txt/README.md (100%) rename modules/network/{private-dns-zones => private-dns-zone}/txt/main.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/txt/main.json (100%) rename modules/network/{private-dns-zones => private-dns-zone}/txt/version.json (100%) rename modules/network/{private-dns-zones => private-dns-zone}/version.json (100%) rename modules/network/{private-dns-zones => private-dns-zone}/virtual-network-links/README.md (100%) rename modules/network/{private-dns-zones => private-dns-zone}/virtual-network-links/main.bicep (100%) rename modules/network/{private-dns-zones => private-dns-zone}/virtual-network-links/main.json (100%) rename modules/network/{private-dns-zones => private-dns-zone}/virtual-network-links/version.json (100%) rename modules/network/{private-endpoints => private-endpoint}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{private-endpoints => private-endpoint}/.test/common/dependencies.bicep (100%) rename modules/network/{private-endpoints => private-endpoint}/.test/common/main.test.bicep (100%) rename modules/network/{private-endpoints => private-endpoint}/.test/main.test.bicep (100%) rename modules/network/{private-endpoints => private-endpoint}/.test/min/dependencies.bicep (100%) rename modules/network/{private-endpoints => private-endpoint}/.test/min/main.test.bicep (100%) rename modules/network/{private-endpoints => private-endpoint}/README.md (99%) rename modules/network/{private-endpoints => private-endpoint}/main.bicep (99%) rename modules/network/{private-endpoints => private-endpoint}/main.json (100%) rename modules/network/{private-endpoints => private-endpoint}/private-dns-zone-groups/README.md (100%) rename modules/network/{private-endpoints => private-endpoint}/private-dns-zone-groups/main.bicep (100%) rename modules/network/{private-endpoints => private-endpoint}/private-dns-zone-groups/main.json (100%) rename modules/network/{private-endpoints => private-endpoint}/private-dns-zone-groups/version.json (100%) rename modules/network/{private-endpoints => private-endpoint}/version.json (100%) rename modules/network/{private-link-services => private-link-service}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{private-link-services => private-link-service}/.test/common/dependencies.bicep (100%) rename modules/network/{private-link-services => private-link-service}/.test/common/main.test.bicep (100%) rename modules/network/{private-link-services => private-link-service}/.test/main.test.bicep (100%) rename modules/network/{private-link-services => private-link-service}/.test/min/dependencies.bicep (100%) rename modules/network/{private-link-services => private-link-service}/.test/min/main.test.bicep (100%) rename modules/network/{private-link-services => private-link-service}/README.md (99%) rename modules/network/{private-link-services => private-link-service}/main.bicep (100%) rename modules/network/{private-link-services => private-link-service}/main.json (100%) rename modules/network/{private-link-services => private-link-service}/version.json (100%) rename modules/network/{public-ip-addresses => public-ip-address}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{public-ip-addresses => public-ip-address}/.test/common/dependencies.bicep (100%) rename modules/network/{public-ip-addresses => public-ip-address}/.test/common/main.test.bicep (100%) rename modules/network/{public-ip-addresses => public-ip-address}/.test/main.test.bicep (100%) rename modules/network/{public-ip-addresses => public-ip-address}/.test/min/main.test.bicep (100%) rename modules/network/{public-ip-addresses => public-ip-address}/README.md (98%) rename modules/network/{public-ip-addresses => public-ip-address}/main.bicep (100%) rename modules/network/{public-ip-addresses => public-ip-address}/main.json (100%) rename modules/network/{public-ip-addresses => public-ip-address}/version.json (100%) rename modules/network/{public-ip-prefixes => public-ip-prefix}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{public-ip-prefixes => public-ip-prefix}/.test/common/dependencies.bicep (100%) rename modules/network/{public-ip-prefixes => public-ip-prefix}/.test/common/main.test.bicep (100%) rename modules/network/{public-ip-prefixes => public-ip-prefix}/.test/main.test.bicep (100%) rename modules/network/{public-ip-prefixes => public-ip-prefix}/.test/min/main.test.bicep (100%) rename modules/network/{public-ip-prefixes => public-ip-prefix}/README.md (98%) rename modules/network/{public-ip-prefixes => public-ip-prefix}/main.bicep (100%) rename modules/network/{public-ip-prefixes => public-ip-prefix}/main.json (100%) rename modules/network/{public-ip-prefixes => public-ip-prefix}/version.json (100%) rename modules/network/{route-tables => route-table}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{route-tables => route-table}/.test/common/dependencies.bicep (100%) rename modules/network/{route-tables => route-table}/.test/common/main.test.bicep (100%) rename modules/network/{route-tables => route-table}/.test/main.test.bicep (100%) rename modules/network/{route-tables => route-table}/.test/min/main.test.bicep (100%) rename modules/network/{route-tables => route-table}/README.md (98%) rename modules/network/{route-tables => route-table}/main.bicep (100%) rename modules/network/{route-tables => route-table}/main.json (100%) rename modules/network/{route-tables => route-table}/version.json (100%) rename modules/network/{service-endpoint-policies => service-endpoint-policy}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{service-endpoint-policies => service-endpoint-policy}/.test/common/dependencies.bicep (100%) rename modules/network/{service-endpoint-policies => service-endpoint-policy}/.test/common/main.test.bicep (100%) rename modules/network/{service-endpoint-policies => service-endpoint-policy}/.test/main.test.bicep (100%) rename modules/network/{service-endpoint-policies => service-endpoint-policy}/.test/min/main.test.bicep (100%) rename modules/network/{service-endpoint-policies => service-endpoint-policy}/README.md (99%) rename modules/network/{service-endpoint-policies => service-endpoint-policy}/main.bicep (100%) rename modules/network/{service-endpoint-policies => service-endpoint-policy}/main.json (100%) rename modules/network/{service-endpoint-policies => service-endpoint-policy}/version.json (100%) rename modules/network/{trafficmanagerprofiles => trafficmanagerprofile}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{trafficmanagerprofiles => trafficmanagerprofile}/.test/common/dependencies.bicep (100%) rename modules/network/{trafficmanagerprofiles => trafficmanagerprofile}/.test/common/main.test.bicep (100%) rename modules/network/{trafficmanagerprofiles => trafficmanagerprofile}/.test/main.test.bicep (100%) rename modules/network/{trafficmanagerprofiles => trafficmanagerprofile}/.test/min/main.test.bicep (100%) rename modules/network/{trafficmanagerprofiles => trafficmanagerprofile}/README.md (98%) rename modules/network/{trafficmanagerprofiles => trafficmanagerprofile}/main.bicep (100%) rename modules/network/{trafficmanagerprofiles => trafficmanagerprofile}/main.json (100%) rename modules/network/{trafficmanagerprofiles => trafficmanagerprofile}/version.json (100%) rename modules/network/{virtual-hubs => virtual-hub}/.test/common/dependencies.bicep (100%) rename modules/network/{virtual-hubs => virtual-hub}/.test/common/main.test.bicep (100%) rename modules/network/{virtual-hubs => virtual-hub}/.test/main.test.bicep (100%) rename modules/network/{virtual-hubs => virtual-hub}/.test/min/dependencies.bicep (100%) rename modules/network/{virtual-hubs => virtual-hub}/.test/min/main.test.bicep (100%) rename modules/network/{virtual-hubs => virtual-hub}/README.md (98%) rename modules/network/{virtual-hubs => virtual-hub}/hub-route-tables/README.md (100%) rename modules/network/{virtual-hubs => virtual-hub}/hub-route-tables/main.bicep (100%) rename modules/network/{virtual-hubs => virtual-hub}/hub-route-tables/main.json (100%) rename modules/network/{virtual-hubs => virtual-hub}/hub-route-tables/version.json (100%) rename modules/network/{virtual-hubs => virtual-hub}/hub-virtual-network-connections/README.md (100%) rename modules/network/{virtual-hubs => virtual-hub}/hub-virtual-network-connections/main.bicep (100%) rename modules/network/{virtual-hubs => virtual-hub}/hub-virtual-network-connections/main.json (100%) rename modules/network/{virtual-hubs => virtual-hub}/hub-virtual-network-connections/version.json (100%) rename modules/network/{virtual-hubs => virtual-hub}/main.bicep (96%) rename modules/network/{virtual-hubs => virtual-hub}/main.json (100%) rename modules/network/{virtual-hubs => virtual-hub}/version.json (100%) rename modules/network/{virtual-network-gateways => virtual-network-gateway}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{virtual-network-gateways => virtual-network-gateway}/.test/aadvpn/dependencies.bicep (100%) rename modules/network/{virtual-network-gateways => virtual-network-gateway}/.test/aadvpn/main.test.bicep (100%) rename modules/network/{virtual-network-gateways => virtual-network-gateway}/.test/expressRoute/dependencies.bicep (100%) rename modules/network/{virtual-network-gateways => virtual-network-gateway}/.test/expressRoute/main.test.bicep (100%) rename modules/network/{virtual-network-gateways => virtual-network-gateway}/.test/main.test.bicep (100%) rename modules/network/{virtual-network-gateways => virtual-network-gateway}/.test/vpn/dependencies.bicep (100%) rename modules/network/{virtual-network-gateways => virtual-network-gateway}/.test/vpn/main.test.bicep (100%) rename modules/network/{virtual-network-gateways => virtual-network-gateway}/README.md (99%) rename modules/network/{virtual-network-gateways => virtual-network-gateway}/main.bicep (98%) rename modules/network/{virtual-network-gateways => virtual-network-gateway}/main.json (100%) rename modules/network/{virtual-network-gateways => virtual-network-gateway}/nat-rules/README.md (100%) rename modules/network/{virtual-network-gateways => virtual-network-gateway}/nat-rules/main.bicep (100%) rename modules/network/{virtual-network-gateways => virtual-network-gateway}/nat-rules/main.json (100%) rename modules/network/{virtual-network-gateways => virtual-network-gateway}/nat-rules/version.json (100%) rename modules/network/{virtual-network-gateways => virtual-network-gateway}/version.json (100%) rename modules/network/{virtual-networks => virtual-network}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{virtual-networks => virtual-network}/.test/common/dependencies.bicep (100%) rename modules/network/{virtual-networks => virtual-network}/.test/common/main.test.bicep (100%) rename modules/network/{virtual-networks => virtual-network}/.test/main.test.bicep (100%) rename modules/network/{virtual-networks => virtual-network}/.test/min/main.test.bicep (100%) rename modules/network/{virtual-networks => virtual-network}/.test/vnetPeering/dependencies.bicep (100%) rename modules/network/{virtual-networks => virtual-network}/.test/vnetPeering/main.test.bicep (100%) rename modules/network/{virtual-networks => virtual-network}/README.md (99%) rename modules/network/{virtual-networks => virtual-network}/main.bicep (97%) rename modules/network/{virtual-networks => virtual-network}/main.json (100%) rename modules/network/{virtual-networks => virtual-network}/subnets/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{virtual-networks => virtual-network}/subnets/README.md (100%) rename modules/network/{virtual-networks => virtual-network}/subnets/main.bicep (100%) rename modules/network/{virtual-networks => virtual-network}/subnets/main.json (100%) rename modules/network/{virtual-networks => virtual-network}/subnets/version.json (100%) rename modules/network/{virtual-networks => virtual-network}/version.json (100%) rename modules/network/{virtual-networks => virtual-network}/virtual-network-peerings/README.md (100%) rename modules/network/{virtual-networks => virtual-network}/virtual-network-peerings/main.bicep (100%) rename modules/network/{virtual-networks => virtual-network}/virtual-network-peerings/main.json (100%) rename modules/network/{virtual-networks => virtual-network}/virtual-network-peerings/version.json (100%) rename modules/network/{virtual-wans => virtual-wan}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{virtual-wans => virtual-wan}/.test/common/dependencies.bicep (100%) rename modules/network/{virtual-wans => virtual-wan}/.test/common/main.test.bicep (100%) rename modules/network/{virtual-wans => virtual-wan}/.test/main.test.bicep (100%) rename modules/network/{virtual-wans => virtual-wan}/.test/min/main.test.bicep (100%) rename modules/network/{virtual-wans => virtual-wan}/README.md (98%) rename modules/network/{virtual-wans => virtual-wan}/main.bicep (100%) rename modules/network/{virtual-wans => virtual-wan}/main.json (100%) rename modules/network/{virtual-wans => virtual-wan}/version.json (100%) rename modules/network/{vpn-gateways => vpn-gateway}/.test/common/dependencies.bicep (100%) rename modules/network/{vpn-gateways => vpn-gateway}/.test/common/main.test.bicep (100%) rename modules/network/{vpn-gateways => vpn-gateway}/.test/main.test.bicep (100%) rename modules/network/{vpn-gateways => vpn-gateway}/.test/min/dependencies.bicep (100%) rename modules/network/{vpn-gateways => vpn-gateway}/.test/min/main.test.bicep (100%) rename modules/network/{vpn-gateways => vpn-gateway}/README.md (98%) rename modules/network/{vpn-gateways => vpn-gateway}/main.bicep (98%) rename modules/network/{vpn-gateways => vpn-gateway}/main.json (100%) rename modules/network/{vpn-gateways => vpn-gateway}/nat-rules/README.md (100%) rename modules/network/{vpn-gateways => vpn-gateway}/nat-rules/main.bicep (100%) rename modules/network/{vpn-gateways => vpn-gateway}/nat-rules/main.json (100%) rename modules/network/{vpn-gateways => vpn-gateway}/nat-rules/version.json (100%) rename modules/network/{vpn-gateways => vpn-gateway}/version.json (100%) rename modules/network/{vpn-gateways => vpn-gateway}/vpn-connections/README.md (100%) rename modules/network/{vpn-gateways => vpn-gateway}/vpn-connections/main.bicep (100%) rename modules/network/{vpn-gateways => vpn-gateway}/vpn-connections/main.json (100%) rename modules/network/{vpn-gateways => vpn-gateway}/vpn-connections/version.json (100%) rename modules/network/{vpn-sites => vpn-site}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/{vpn-sites => vpn-site}/.test/common/dependencies.bicep (100%) rename modules/network/{vpn-sites => vpn-site}/.test/common/main.test.bicep (100%) rename modules/network/{vpn-sites => vpn-site}/.test/main.test.bicep (100%) rename modules/network/{vpn-sites => vpn-site}/.test/min/dependencies.bicep (100%) rename modules/network/{vpn-sites => vpn-site}/.test/min/main.test.bicep (100%) rename modules/network/{vpn-sites => vpn-site}/README.md (99%) rename modules/network/{vpn-sites => vpn-site}/main.bicep (100%) rename modules/network/{vpn-sites => vpn-site}/main.json (100%) rename modules/network/{vpn-sites => vpn-site}/version.json (100%) rename modules/operational-insights/{workspaces => workspace}/.bicep/nested_roleAssignments.bicep (100%) rename modules/operational-insights/{workspaces => workspace}/.test/adv/dependencies.bicep (100%) rename modules/operational-insights/{workspaces => workspace}/.test/adv/main.test.bicep (100%) rename modules/operational-insights/{workspaces => workspace}/.test/common/dependencies.bicep (100%) rename modules/operational-insights/{workspaces => workspace}/.test/common/main.test.bicep (100%) rename modules/operational-insights/{workspaces => workspace}/.test/main.test.bicep (100%) rename modules/operational-insights/{workspaces => workspace}/.test/min/main.test.bicep (100%) rename modules/operational-insights/{workspaces => workspace}/README.md (99%) rename modules/operational-insights/{workspaces => workspace}/data-exports/README.md (100%) rename modules/operational-insights/{workspaces => workspace}/data-exports/main.bicep (100%) rename modules/operational-insights/{workspaces => workspace}/data-exports/main.json (100%) rename modules/operational-insights/{workspaces => workspace}/data-exports/version.json (100%) rename modules/operational-insights/{workspaces => workspace}/data-sources/README.md (100%) rename modules/operational-insights/{workspaces => workspace}/data-sources/main.bicep (100%) rename modules/operational-insights/{workspaces => workspace}/data-sources/main.json (100%) rename modules/operational-insights/{workspaces => workspace}/data-sources/version.json (100%) rename modules/operational-insights/{workspaces => workspace}/linked-services/README.md (100%) rename modules/operational-insights/{workspaces => workspace}/linked-services/main.bicep (100%) rename modules/operational-insights/{workspaces => workspace}/linked-services/main.json (100%) rename modules/operational-insights/{workspaces => workspace}/linked-services/version.json (100%) rename modules/operational-insights/{workspaces => workspace}/linked-storage-accounts/README.md (100%) rename modules/operational-insights/{workspaces => workspace}/linked-storage-accounts/main.bicep (100%) rename modules/operational-insights/{workspaces => workspace}/linked-storage-accounts/main.json (100%) rename modules/operational-insights/{workspaces => workspace}/linked-storage-accounts/version.json (100%) rename modules/operational-insights/{workspaces => workspace}/main.bicep (94%) rename modules/operational-insights/{workspaces => workspace}/main.json (100%) rename modules/operational-insights/{workspaces => workspace}/saved-searches/README.md (100%) rename modules/operational-insights/{workspaces => workspace}/saved-searches/main.bicep (100%) rename modules/operational-insights/{workspaces => workspace}/saved-searches/main.json (100%) rename modules/operational-insights/{workspaces => workspace}/saved-searches/version.json (100%) rename modules/operational-insights/{workspaces => workspace}/storage-insight-configs/README.md (100%) rename modules/operational-insights/{workspaces => workspace}/storage-insight-configs/main.bicep (100%) rename modules/operational-insights/{workspaces => workspace}/storage-insight-configs/main.json (100%) rename modules/operational-insights/{workspaces => workspace}/storage-insight-configs/version.json (100%) rename modules/operational-insights/{workspaces => workspace}/tables/README.md (100%) rename modules/operational-insights/{workspaces => workspace}/tables/main.bicep (100%) rename modules/operational-insights/{workspaces => workspace}/tables/main.json (100%) rename modules/operational-insights/{workspaces => workspace}/tables/version.json (100%) rename modules/operational-insights/{workspaces => workspace}/version.json (100%) rename modules/operations-management/{solutions => solution}/.test/main.test.bicep (100%) rename modules/operations-management/{solutions => solution}/.test/min/dependencies.bicep (100%) rename modules/operations-management/{solutions => solution}/.test/min/main.test.bicep (100%) rename modules/operations-management/{solutions => solution}/.test/ms/dependencies.bicep (100%) rename modules/operations-management/{solutions => solution}/.test/ms/main.test.bicep (100%) rename modules/operations-management/{solutions => solution}/.test/nonms/dependencies.bicep (100%) rename modules/operations-management/{solutions => solution}/.test/nonms/main.test.bicep (100%) rename modules/operations-management/{solutions => solution}/README.md (96%) rename modules/operations-management/{solutions => solution}/main.bicep (100%) rename modules/operations-management/{solutions => solution}/main.json (100%) rename modules/operations-management/{solutions => solution}/version.json (100%) rename modules/policy-insights/{remediations => remediation}/.test/main.test.bicep (100%) rename modules/policy-insights/{remediations => remediation}/.test/mg.common/main.test.bicep (100%) rename modules/policy-insights/{remediations => remediation}/.test/mg.min/main.test.bicep (100%) rename modules/policy-insights/{remediations => remediation}/.test/rg.common/main.test.bicep (100%) rename modules/policy-insights/{remediations => remediation}/.test/rg.min/main.test.bicep (100%) rename modules/policy-insights/{remediations => remediation}/.test/sub.common/main.test.bicep (100%) rename modules/policy-insights/{remediations => remediation}/.test/sub.min/main.test.bicep (100%) rename modules/policy-insights/{remediations => remediation}/README.md (96%) rename modules/policy-insights/{remediations => remediation}/main.bicep (100%) rename modules/policy-insights/{remediations => remediation}/main.json (100%) rename modules/policy-insights/{remediations => remediation}/management-group/README.md (100%) rename modules/policy-insights/{remediations => remediation}/management-group/main.bicep (100%) rename modules/policy-insights/{remediations => remediation}/management-group/main.json (100%) rename modules/policy-insights/{remediations => remediation}/management-group/version.json (100%) rename modules/policy-insights/{remediations => remediation}/resource-group/README.md (100%) rename modules/policy-insights/{remediations => remediation}/resource-group/main.bicep (100%) rename modules/policy-insights/{remediations => remediation}/resource-group/main.json (100%) rename modules/policy-insights/{remediations => remediation}/resource-group/version.json (100%) rename modules/policy-insights/{remediations => remediation}/subscription/README.md (100%) rename modules/policy-insights/{remediations => remediation}/subscription/main.bicep (100%) rename modules/policy-insights/{remediations => remediation}/subscription/main.json (100%) rename modules/policy-insights/{remediations => remediation}/subscription/version.json (100%) rename modules/policy-insights/{remediations => remediation}/version.json (100%) rename modules/power-bi-dedicated/{capacities => capacity}/.bicep/nested_roleAssignments.bicep (100%) rename modules/power-bi-dedicated/{capacities => capacity}/.test/common/dependencies.bicep (100%) rename modules/power-bi-dedicated/{capacities => capacity}/.test/common/main.test.bicep (100%) rename modules/power-bi-dedicated/{capacities => capacity}/.test/main.test.bicep (100%) rename modules/power-bi-dedicated/{capacities => capacity}/.test/min/dependencies.bicep (100%) rename modules/power-bi-dedicated/{capacities => capacity}/.test/min/main.test.bicep (100%) rename modules/power-bi-dedicated/{capacities => capacity}/README.md (98%) rename modules/power-bi-dedicated/{capacities => capacity}/main.bicep (100%) rename modules/power-bi-dedicated/{capacities => capacity}/main.json (100%) rename modules/power-bi-dedicated/{capacities => capacity}/version.json (100%) rename modules/purview/{accounts => account}/.bicep/nested_roleAssignments.bicep (100%) rename modules/purview/{accounts => account}/.test/common/dependencies.bicep (100%) rename modules/purview/{accounts => account}/.test/common/main.test.bicep (100%) rename modules/purview/{accounts => account}/.test/main.test.bicep (100%) rename modules/purview/{accounts => account}/.test/min/main.test.bicep (100%) rename modules/purview/{accounts => account}/README.md (99%) rename modules/purview/{accounts => account}/main.bicep (96%) rename modules/purview/{accounts => account}/main.json (100%) rename modules/purview/{accounts => account}/version.json (100%) rename modules/recovery-services/{vaults => vault}/.bicep/nested_roleAssignments.bicep (100%) rename modules/recovery-services/{vaults => vault}/.test/common/dependencies.bicep (100%) rename modules/recovery-services/{vaults => vault}/.test/common/main.test.bicep (100%) rename modules/recovery-services/{vaults => vault}/.test/dr/main.test.bicep (100%) rename modules/recovery-services/{vaults => vault}/.test/main.test.bicep (100%) rename modules/recovery-services/{vaults => vault}/.test/min/main.test.bicep (100%) rename modules/recovery-services/{vaults => vault}/README.md (99%) rename modules/recovery-services/{vaults => vault}/backup-config/README.md (100%) rename modules/recovery-services/{vaults => vault}/backup-config/main.bicep (100%) rename modules/recovery-services/{vaults => vault}/backup-config/main.json (100%) rename modules/recovery-services/{vaults => vault}/backup-config/version.json (100%) rename modules/recovery-services/{vaults => vault}/backup-fabrics/protection-containers/README.md (100%) rename modules/recovery-services/{vaults => vault}/backup-fabrics/protection-containers/main.bicep (96%) rename modules/recovery-services/{vaults => vault}/backup-fabrics/protection-containers/main.json (100%) rename modules/recovery-services/{vaults => vault}/backup-fabrics/protection-containers/protected-items/README.md (100%) rename modules/recovery-services/{vaults => vault}/backup-fabrics/protection-containers/protected-items/main.bicep (100%) rename modules/recovery-services/{vaults => vault}/backup-fabrics/protection-containers/protected-items/main.json (100%) rename modules/recovery-services/{vaults => vault}/backup-fabrics/protection-containers/protected-items/version.json (100%) rename modules/recovery-services/{vaults => vault}/backup-fabrics/protection-containers/version.json (100%) rename modules/recovery-services/{vaults => vault}/backup-policies/README.md (100%) rename modules/recovery-services/{vaults => vault}/backup-policies/main.bicep (100%) rename modules/recovery-services/{vaults => vault}/backup-policies/main.json (100%) rename modules/recovery-services/{vaults => vault}/backup-policies/version.json (100%) rename modules/recovery-services/{vaults => vault}/backup-storage-config/README.md (100%) rename modules/recovery-services/{vaults => vault}/backup-storage-config/main.bicep (100%) rename modules/recovery-services/{vaults => vault}/backup-storage-config/main.json (100%) rename modules/recovery-services/{vaults => vault}/backup-storage-config/version.json (100%) rename modules/recovery-services/{vaults => vault}/main.bicep (95%) rename modules/recovery-services/{vaults => vault}/main.json (100%) rename modules/recovery-services/{vaults => vault}/replication-alert-settings/README.md (100%) rename modules/recovery-services/{vaults => vault}/replication-alert-settings/main.bicep (100%) rename modules/recovery-services/{vaults => vault}/replication-alert-settings/main.json (100%) rename modules/recovery-services/{vaults => vault}/replication-alert-settings/version.json (100%) rename modules/recovery-services/{vaults => vault}/replication-fabrics/README.md (100%) rename modules/recovery-services/{vaults => vault}/replication-fabrics/main.bicep (97%) rename modules/recovery-services/{vaults => vault}/replication-fabrics/main.json (100%) rename modules/recovery-services/{vaults => vault}/replication-fabrics/replication-protection-containers/README.md (100%) rename modules/recovery-services/{vaults => vault}/replication-fabrics/replication-protection-containers/main.bicep (97%) rename modules/recovery-services/{vaults => vault}/replication-fabrics/replication-protection-containers/main.json (100%) rename modules/recovery-services/{vaults => vault}/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/README.md (100%) rename modules/recovery-services/{vaults => vault}/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/main.bicep (100%) rename modules/recovery-services/{vaults => vault}/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/main.json (100%) rename modules/recovery-services/{vaults => vault}/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/version.json (100%) rename modules/recovery-services/{vaults => vault}/replication-fabrics/replication-protection-containers/version.json (100%) rename modules/recovery-services/{vaults => vault}/replication-fabrics/version.json (100%) rename modules/recovery-services/{vaults => vault}/replication-policies/README.md (100%) rename modules/recovery-services/{vaults => vault}/replication-policies/main.bicep (100%) rename modules/recovery-services/{vaults => vault}/replication-policies/main.json (100%) rename modules/recovery-services/{vaults => vault}/replication-policies/version.json (100%) rename modules/recovery-services/{vaults => vault}/version.json (100%) rename modules/relay/{namespaces => namespace}/.bicep/nested_roleAssignments.bicep (100%) rename modules/relay/{namespaces => namespace}/.test/common/dependencies.bicep (100%) rename modules/relay/{namespaces => namespace}/.test/common/main.test.bicep (100%) rename modules/relay/{namespaces => namespace}/.test/main.test.bicep (100%) rename modules/relay/{namespaces => namespace}/.test/min/main.test.bicep (100%) rename modules/relay/{namespaces => namespace}/.test/pe/dependencies.bicep (100%) rename modules/relay/{namespaces => namespace}/.test/pe/main.test.bicep (100%) rename modules/relay/{namespaces => namespace}/README.md (99%) rename modules/relay/{namespaces => namespace}/authorization-rules/README.md (100%) rename modules/relay/{namespaces => namespace}/authorization-rules/main.bicep (100%) rename modules/relay/{namespaces => namespace}/authorization-rules/main.json (100%) rename modules/relay/{namespaces => namespace}/authorization-rules/version.json (100%) rename modules/relay/{namespaces => namespace}/hybrid-connections/.bicep/nested_roleAssignments.bicep (100%) rename modules/relay/{namespaces => namespace}/hybrid-connections/README.md (100%) rename modules/relay/{namespaces => namespace}/hybrid-connections/authorization-rules/README.md (100%) rename modules/relay/{namespaces => namespace}/hybrid-connections/authorization-rules/main.bicep (100%) rename modules/relay/{namespaces => namespace}/hybrid-connections/authorization-rules/main.json (100%) rename modules/relay/{namespaces => namespace}/hybrid-connections/authorization-rules/version.json (100%) rename modules/relay/{namespaces => namespace}/hybrid-connections/main.bicep (97%) rename modules/relay/{namespaces => namespace}/hybrid-connections/main.json (100%) rename modules/relay/{namespaces => namespace}/hybrid-connections/version.json (100%) rename modules/relay/{namespaces => namespace}/main.bicep (95%) rename modules/relay/{namespaces => namespace}/main.json (100%) rename modules/relay/{namespaces => namespace}/network-rule-sets/README.md (100%) rename modules/relay/{namespaces => namespace}/network-rule-sets/main.bicep (100%) rename modules/relay/{namespaces => namespace}/network-rule-sets/main.json (100%) rename modules/relay/{namespaces => namespace}/network-rule-sets/version.json (100%) rename modules/relay/{namespaces => namespace}/version.json (100%) rename modules/relay/{namespaces => namespace}/wcf-relays/.bicep/nested_roleAssignments.bicep (100%) rename modules/relay/{namespaces => namespace}/wcf-relays/README.md (100%) rename modules/relay/{namespaces => namespace}/wcf-relays/authorization-rules/README.md (100%) rename modules/relay/{namespaces => namespace}/wcf-relays/authorization-rules/main.bicep (100%) rename modules/relay/{namespaces => namespace}/wcf-relays/authorization-rules/main.json (100%) rename modules/relay/{namespaces => namespace}/wcf-relays/authorization-rules/version.json (100%) rename modules/relay/{namespaces => namespace}/wcf-relays/main.bicep (97%) rename modules/relay/{namespaces => namespace}/wcf-relays/main.json (100%) rename modules/relay/{namespaces => namespace}/wcf-relays/version.json (100%) rename modules/resources/{deployment-scripts => deployment-script}/.test/cli/dependencies.bicep (100%) rename modules/resources/{deployment-scripts => deployment-script}/.test/cli/main.test.bicep (100%) rename modules/resources/{deployment-scripts => deployment-script}/.test/main.test.bicep (100%) rename modules/resources/{deployment-scripts => deployment-script}/.test/ps/dependencies.bicep (100%) rename modules/resources/{deployment-scripts => deployment-script}/.test/ps/main.test.bicep (100%) rename modules/resources/{deployment-scripts => deployment-script}/README.md (98%) rename modules/resources/{deployment-scripts => deployment-script}/main.bicep (100%) rename modules/resources/{deployment-scripts => deployment-script}/main.json (100%) rename modules/resources/{deployment-scripts => deployment-script}/version.json (100%) rename modules/resources/{resource-groups => resource-group}/.bicep/nested_roleAssignments.bicep (100%) rename modules/resources/{resource-groups => resource-group}/.test/common/dependencies.bicep (100%) rename modules/resources/{resource-groups => resource-group}/.test/common/main.test.bicep (100%) rename modules/resources/{resource-groups => resource-group}/.test/main.test.bicep (100%) rename modules/resources/{resource-groups => resource-group}/.test/min/main.test.bicep (100%) rename modules/resources/{resource-groups => resource-group}/README.md (98%) rename modules/resources/{resource-groups => resource-group}/main.bicep (96%) rename modules/resources/{resource-groups => resource-group}/main.json (100%) rename modules/resources/{resource-groups => resource-group}/version.json (100%) rename modules/resources/tags/{resource-groups => resource-group}/.bicep/readTags.bicep (100%) rename modules/resources/tags/{resource-groups => resource-group}/README.md (100%) rename modules/resources/tags/{resource-groups => resource-group}/main.bicep (100%) rename modules/resources/tags/{resource-groups => resource-group}/main.json (100%) rename modules/resources/tags/{resource-groups => resource-group}/version.json (100%) rename modules/resources/tags/{subscriptions => subscription}/.bicep/readTags.bicep (100%) rename modules/resources/tags/{subscriptions => subscription}/README.md (100%) rename modules/resources/tags/{subscriptions => subscription}/main.bicep (100%) rename modules/resources/tags/{subscriptions => subscription}/main.json (100%) rename modules/resources/tags/{subscriptions => subscription}/version.json (100%) rename modules/service-bus/{namespaces => namespace}/.bicep/nested_roleAssignments.bicep (100%) rename modules/service-bus/{namespaces => namespace}/.test/common/dependencies.bicep (100%) rename modules/service-bus/{namespaces => namespace}/.test/common/main.test.bicep (100%) rename modules/service-bus/{namespaces => namespace}/.test/encr/dependencies.bicep (100%) rename modules/service-bus/{namespaces => namespace}/.test/encr/main.test.bicep (100%) rename modules/service-bus/{namespaces => namespace}/.test/main.test.bicep (100%) rename modules/service-bus/{namespaces => namespace}/.test/min/main.test.bicep (100%) rename modules/service-bus/{namespaces => namespace}/.test/pe/dependencies.bicep (100%) rename modules/service-bus/{namespaces => namespace}/.test/pe/main.test.bicep (100%) rename modules/service-bus/{namespaces => namespace}/README.md (99%) rename modules/service-bus/{namespaces => namespace}/authorization-rules/README.md (100%) rename modules/service-bus/{namespaces => namespace}/authorization-rules/main.bicep (100%) rename modules/service-bus/{namespaces => namespace}/authorization-rules/main.json (100%) rename modules/service-bus/{namespaces => namespace}/authorization-rules/version.json (100%) rename modules/service-bus/{namespaces => namespace}/disaster-recovery-configs/README.md (100%) rename modules/service-bus/{namespaces => namespace}/disaster-recovery-configs/main.bicep (100%) rename modules/service-bus/{namespaces => namespace}/disaster-recovery-configs/main.json (100%) rename modules/service-bus/{namespaces => namespace}/disaster-recovery-configs/version.json (100%) rename modules/service-bus/{namespaces => namespace}/main.bicep (96%) rename modules/service-bus/{namespaces => namespace}/main.json (100%) rename modules/service-bus/{namespaces => namespace}/migration-configurations/README.md (100%) rename modules/service-bus/{namespaces => namespace}/migration-configurations/main.bicep (100%) rename modules/service-bus/{namespaces => namespace}/migration-configurations/main.json (100%) rename modules/service-bus/{namespaces => namespace}/migration-configurations/version.json (100%) rename modules/service-bus/{namespaces => namespace}/network-rule-sets/README.md (100%) rename modules/service-bus/{namespaces => namespace}/network-rule-sets/main.bicep (100%) rename modules/service-bus/{namespaces => namespace}/network-rule-sets/main.json (100%) rename modules/service-bus/{namespaces => namespace}/network-rule-sets/version.json (100%) rename modules/service-bus/{namespaces => namespace}/queues/.bicep/nested_roleAssignments.bicep (100%) rename modules/service-bus/{namespaces => namespace}/queues/README.md (100%) rename modules/service-bus/{namespaces => namespace}/queues/authorization-rules/README.md (100%) rename modules/service-bus/{namespaces => namespace}/queues/authorization-rules/main.bicep (100%) rename modules/service-bus/{namespaces => namespace}/queues/authorization-rules/main.json (100%) rename modules/service-bus/{namespaces => namespace}/queues/authorization-rules/version.json (100%) rename modules/service-bus/{namespaces => namespace}/queues/main.bicep (98%) rename modules/service-bus/{namespaces => namespace}/queues/main.json (100%) rename modules/service-bus/{namespaces => namespace}/queues/version.json (100%) rename modules/service-bus/{namespaces => namespace}/topics/.bicep/nested_roleAssignments.bicep (100%) rename modules/service-bus/{namespaces => namespace}/topics/README.md (100%) rename modules/service-bus/{namespaces => namespace}/topics/authorization-rules/README.md (100%) rename modules/service-bus/{namespaces => namespace}/topics/authorization-rules/main.bicep (100%) rename modules/service-bus/{namespaces => namespace}/topics/authorization-rules/main.json (100%) rename modules/service-bus/{namespaces => namespace}/topics/authorization-rules/version.json (100%) rename modules/service-bus/{namespaces => namespace}/topics/main.bicep (98%) rename modules/service-bus/{namespaces => namespace}/topics/main.json (100%) rename modules/service-bus/{namespaces => namespace}/topics/version.json (100%) rename modules/service-bus/{namespaces => namespace}/version.json (100%) rename modules/service-fabric/{clusters => cluster}/.bicep/nested_roleAssignments.bicep (100%) rename modules/service-fabric/{clusters => cluster}/.test/cert/main.test.bicep (100%) rename modules/service-fabric/{clusters => cluster}/.test/common/dependencies.bicep (100%) rename modules/service-fabric/{clusters => cluster}/.test/common/main.test.bicep (100%) rename modules/service-fabric/{clusters => cluster}/.test/main.test.bicep (100%) rename modules/service-fabric/{clusters => cluster}/.test/min/main.test.bicep (100%) rename modules/service-fabric/{clusters => cluster}/README.md (99%) rename modules/service-fabric/{clusters => cluster}/application-types/README.md (100%) rename modules/service-fabric/{clusters => cluster}/application-types/main.bicep (100%) rename modules/service-fabric/{clusters => cluster}/application-types/main.json (100%) rename modules/service-fabric/{clusters => cluster}/application-types/version.json (100%) rename modules/service-fabric/{clusters => cluster}/main.bicep (99%) rename modules/service-fabric/{clusters => cluster}/main.json (100%) rename modules/service-fabric/{clusters => cluster}/version.json (100%) rename modules/sql/{managed-instances => managed-instance}/.bicep/nested_roleAssignments.bicep (100%) rename modules/sql/{managed-instances => managed-instance}/.test/common/dependencies.bicep (100%) rename modules/sql/{managed-instances => managed-instance}/.test/common/main.test.bicep (100%) rename modules/sql/{managed-instances => managed-instance}/.test/main.test.bicep (100%) rename modules/sql/{managed-instances => managed-instance}/.test/min/dependencies.bicep (100%) rename modules/sql/{managed-instances => managed-instance}/.test/min/main.test.bicep (100%) rename modules/sql/{managed-instances => managed-instance}/README.md (99%) rename modules/sql/{managed-instances => managed-instance}/administrators/README.md (100%) rename modules/sql/{managed-instances => managed-instance}/administrators/main.bicep (100%) rename modules/sql/{managed-instances => managed-instance}/administrators/main.json (100%) rename modules/sql/{managed-instances => managed-instance}/administrators/version.json (100%) rename modules/sql/{managed-instances => managed-instance}/databases/README.md (100%) rename modules/sql/{managed-instances => managed-instance}/databases/backup-long-term-retention-policies/README.md (100%) rename modules/sql/{managed-instances => managed-instance}/databases/backup-long-term-retention-policies/main.bicep (100%) rename modules/sql/{managed-instances => managed-instance}/databases/backup-long-term-retention-policies/main.json (100%) rename modules/sql/{managed-instances => managed-instance}/databases/backup-long-term-retention-policies/version.json (100%) rename modules/sql/{managed-instances => managed-instance}/databases/backup-short-term-retention-policies/README.md (100%) rename modules/sql/{managed-instances => managed-instance}/databases/backup-short-term-retention-policies/main.bicep (100%) rename modules/sql/{managed-instances => managed-instance}/databases/backup-short-term-retention-policies/main.json (100%) rename modules/sql/{managed-instances => managed-instance}/databases/backup-short-term-retention-policies/version.json (100%) rename modules/sql/{managed-instances => managed-instance}/databases/main.bicep (98%) rename modules/sql/{managed-instances => managed-instance}/databases/main.json (100%) rename modules/sql/{managed-instances => managed-instance}/databases/version.json (100%) rename modules/sql/{managed-instances => managed-instance}/encryption-protector/README.md (100%) rename modules/sql/{managed-instances => managed-instance}/encryption-protector/main.bicep (100%) rename modules/sql/{managed-instances => managed-instance}/encryption-protector/main.json (100%) rename modules/sql/{managed-instances => managed-instance}/encryption-protector/version.json (100%) rename modules/sql/{managed-instances => managed-instance}/keys/README.md (100%) rename modules/sql/{managed-instances => managed-instance}/keys/main.bicep (100%) rename modules/sql/{managed-instances => managed-instance}/keys/main.json (100%) rename modules/sql/{managed-instances => managed-instance}/keys/version.json (100%) rename modules/sql/{managed-instances => managed-instance}/main.bicep (97%) rename modules/sql/{managed-instances => managed-instance}/main.json (100%) rename modules/sql/{managed-instances => managed-instance}/security-alert-policies/README.md (100%) rename modules/sql/{managed-instances => managed-instance}/security-alert-policies/main.bicep (100%) rename modules/sql/{managed-instances => managed-instance}/security-alert-policies/main.json (100%) rename modules/sql/{managed-instances => managed-instance}/security-alert-policies/version.json (100%) rename modules/sql/{managed-instances => managed-instance}/version.json (100%) rename modules/sql/{managed-instances => managed-instance}/vulnerability-assessments/README.md (100%) rename modules/sql/{managed-instances => managed-instance}/vulnerability-assessments/main.bicep (100%) rename modules/sql/{managed-instances => managed-instance}/vulnerability-assessments/main.json (100%) rename modules/sql/{managed-instances => managed-instance}/vulnerability-assessments/version.json (100%) rename modules/sql/{servers => server}/.bicep/nested_roleAssignments.bicep (100%) rename modules/sql/{servers => server}/.test/admin/dependencies.bicep (100%) rename modules/sql/{servers => server}/.test/admin/main.test.bicep (100%) rename modules/sql/{servers => server}/.test/common/dependencies.bicep (100%) rename modules/sql/{servers => server}/.test/common/main.test.bicep (100%) rename modules/sql/{servers => server}/.test/main.test.bicep (100%) rename modules/sql/{servers => server}/.test/pe/dependencies.bicep (100%) rename modules/sql/{servers => server}/.test/pe/main.test.bicep (100%) rename modules/sql/{servers => server}/.test/secondary/dependencies.bicep (100%) rename modules/sql/{servers => server}/.test/secondary/main.test.bicep (100%) rename modules/sql/{servers => server}/README.md (99%) rename modules/sql/{servers => server}/databases/README.md (100%) rename modules/sql/{servers => server}/databases/backup-long-term-retention-policies/README.md (100%) rename modules/sql/{servers => server}/databases/backup-long-term-retention-policies/main.bicep (100%) rename modules/sql/{servers => server}/databases/backup-long-term-retention-policies/main.json (100%) rename modules/sql/{servers => server}/databases/backup-long-term-retention-policies/version.json (100%) rename modules/sql/{servers => server}/databases/backup-short-term-retention-policies/README.md (100%) rename modules/sql/{servers => server}/databases/backup-short-term-retention-policies/main.bicep (100%) rename modules/sql/{servers => server}/databases/backup-short-term-retention-policies/main.json (100%) rename modules/sql/{servers => server}/databases/backup-short-term-retention-policies/version.json (100%) rename modules/sql/{servers => server}/databases/main.bicep (99%) rename modules/sql/{servers => server}/databases/main.json (100%) rename modules/sql/{servers => server}/databases/version.json (100%) rename modules/sql/{servers => server}/elastic-pools/README.md (100%) rename modules/sql/{servers => server}/elastic-pools/main.bicep (100%) rename modules/sql/{servers => server}/elastic-pools/main.json (100%) rename modules/sql/{servers => server}/elastic-pools/version.json (100%) rename modules/sql/{servers => server}/encryption-protector/README.md (100%) rename modules/sql/{servers => server}/encryption-protector/main.bicep (100%) rename modules/sql/{servers => server}/encryption-protector/main.json (100%) rename modules/sql/{servers => server}/encryption-protector/version.json (100%) rename modules/sql/{servers => server}/firewall-rules/README.md (100%) rename modules/sql/{servers => server}/firewall-rules/main.bicep (100%) rename modules/sql/{servers => server}/firewall-rules/main.json (100%) rename modules/sql/{servers => server}/firewall-rules/version.json (100%) rename modules/sql/{servers => server}/keys/README.md (100%) rename modules/sql/{servers => server}/keys/main.bicep (100%) rename modules/sql/{servers => server}/keys/main.json (100%) rename modules/sql/{servers => server}/keys/version.json (100%) rename modules/sql/{servers => server}/main.bicep (95%) rename modules/sql/{servers => server}/main.json (100%) rename modules/sql/{servers => server}/security-alert-policies/README.md (100%) rename modules/sql/{servers => server}/security-alert-policies/main.bicep (100%) rename modules/sql/{servers => server}/security-alert-policies/main.json (100%) rename modules/sql/{servers => server}/security-alert-policies/version.json (100%) rename modules/sql/{servers => server}/version.json (100%) rename modules/sql/{servers => server}/virtual-network-rules/README.md (100%) rename modules/sql/{servers => server}/virtual-network-rules/main.bicep (100%) rename modules/sql/{servers => server}/virtual-network-rules/main.json (100%) rename modules/sql/{servers => server}/virtual-network-rules/version.json (100%) rename modules/sql/{servers => server}/vulnerability-assessments/README.md (100%) rename modules/sql/{servers => server}/vulnerability-assessments/main.bicep (100%) rename modules/sql/{servers => server}/vulnerability-assessments/main.json (100%) rename modules/sql/{servers => server}/vulnerability-assessments/version.json (100%) rename modules/storage/{storage-accounts => storage-account}/.bicep/nested_roleAssignments.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/.test/common/dependencies.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/.test/common/main.test.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/.test/encr/dependencies.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/.test/encr/main.test.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/.test/main.test.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/.test/min/main.test.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/.test/nfs/dependencies.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/.test/nfs/main.test.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/.test/v1/main.test.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/README.md (99%) rename modules/storage/{storage-accounts => storage-account}/blob-services/README.md (100%) rename modules/storage/{storage-accounts => storage-account}/blob-services/containers/.bicep/nested_roleAssignments.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/blob-services/containers/README.md (100%) rename modules/storage/{storage-accounts => storage-account}/blob-services/containers/immutability-policies/README.md (100%) rename modules/storage/{storage-accounts => storage-account}/blob-services/containers/immutability-policies/main.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/blob-services/containers/immutability-policies/main.json (100%) rename modules/storage/{storage-accounts => storage-account}/blob-services/containers/immutability-policies/version.json (100%) rename modules/storage/{storage-accounts => storage-account}/blob-services/containers/main.bicep (98%) rename modules/storage/{storage-accounts => storage-account}/blob-services/containers/main.json (100%) rename modules/storage/{storage-accounts => storage-account}/blob-services/containers/version.json (100%) rename modules/storage/{storage-accounts => storage-account}/blob-services/main.bicep (99%) rename modules/storage/{storage-accounts => storage-account}/blob-services/main.json (100%) rename modules/storage/{storage-accounts => storage-account}/blob-services/version.json (100%) rename modules/storage/{storage-accounts => storage-account}/file-services/README.md (100%) rename modules/storage/{storage-accounts => storage-account}/file-services/main.bicep (98%) rename modules/storage/{storage-accounts => storage-account}/file-services/main.json (100%) rename modules/storage/{storage-accounts => storage-account}/file-services/shares/.bicep/nested_roleAssignments.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/file-services/shares/README.md (100%) rename modules/storage/{storage-accounts => storage-account}/file-services/shares/main.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/file-services/shares/main.json (100%) rename modules/storage/{storage-accounts => storage-account}/file-services/shares/version.json (100%) rename modules/storage/{storage-accounts => storage-account}/file-services/version.json (100%) rename modules/storage/{storage-accounts => storage-account}/local-users/README.md (100%) rename modules/storage/{storage-accounts => storage-account}/local-users/main.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/local-users/main.json (100%) rename modules/storage/{storage-accounts => storage-account}/local-users/version.json (100%) rename modules/storage/{storage-accounts => storage-account}/main.bicep (97%) rename modules/storage/{storage-accounts => storage-account}/main.json (100%) rename modules/storage/{storage-accounts => storage-account}/management-policies/README.md (100%) rename modules/storage/{storage-accounts => storage-account}/management-policies/main.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/management-policies/main.json (100%) rename modules/storage/{storage-accounts => storage-account}/management-policies/version.json (100%) rename modules/storage/{storage-accounts => storage-account}/queue-services/README.md (100%) rename modules/storage/{storage-accounts => storage-account}/queue-services/main.bicep (98%) rename modules/storage/{storage-accounts => storage-account}/queue-services/main.json (100%) rename modules/storage/{storage-accounts => storage-account}/queue-services/queues/.bicep/nested_roleAssignments.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/queue-services/queues/README.md (100%) rename modules/storage/{storage-accounts => storage-account}/queue-services/queues/main.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/queue-services/queues/main.json (100%) rename modules/storage/{storage-accounts => storage-account}/queue-services/queues/version.json (100%) rename modules/storage/{storage-accounts => storage-account}/queue-services/version.json (100%) rename modules/storage/{storage-accounts => storage-account}/table-services/README.md (100%) rename modules/storage/{storage-accounts => storage-account}/table-services/main.bicep (98%) rename modules/storage/{storage-accounts => storage-account}/table-services/main.json (100%) rename modules/storage/{storage-accounts => storage-account}/table-services/tables/README.md (100%) rename modules/storage/{storage-accounts => storage-account}/table-services/tables/main.bicep (100%) rename modules/storage/{storage-accounts => storage-account}/table-services/tables/main.json (100%) rename modules/storage/{storage-accounts => storage-account}/table-services/tables/version.json (100%) rename modules/storage/{storage-accounts => storage-account}/table-services/version.json (100%) rename modules/storage/{storage-accounts => storage-account}/version.json (100%) rename modules/synapse/{private-link-hubs => private-link-hub}/.bicep/nested_roleAssignments.bicep (100%) rename modules/synapse/{private-link-hubs => private-link-hub}/.test/common/dependencies.bicep (100%) rename modules/synapse/{private-link-hubs => private-link-hub}/.test/common/main.test.bicep (100%) rename modules/synapse/{private-link-hubs => private-link-hub}/.test/main.test.bicep (100%) rename modules/synapse/{private-link-hubs => private-link-hub}/.test/min/main.test.bicep (100%) rename modules/synapse/{private-link-hubs => private-link-hub}/README.md (99%) rename modules/synapse/{private-link-hubs => private-link-hub}/main.bicep (98%) rename modules/synapse/{private-link-hubs => private-link-hub}/main.json (100%) rename modules/synapse/{private-link-hubs => private-link-hub}/version.json (100%) rename modules/synapse/{workspaces => workspace}/.bicep/nested_cmkRbac.bicep (100%) rename modules/synapse/{workspaces => workspace}/.bicep/nested_roleAssignments.bicep (100%) rename modules/synapse/{workspaces => workspace}/.test/common/dependencies.bicep (100%) rename modules/synapse/{workspaces => workspace}/.test/common/main.test.bicep (100%) rename modules/synapse/{workspaces => workspace}/.test/encrwsai/dependencies.bicep (100%) rename modules/synapse/{workspaces => workspace}/.test/encrwsai/main.test.bicep (100%) rename modules/synapse/{workspaces => workspace}/.test/encrwuai/dependencies.bicep (100%) rename modules/synapse/{workspaces => workspace}/.test/encrwuai/main.test.bicep (100%) rename modules/synapse/{workspaces => workspace}/.test/main.test.bicep (100%) rename modules/synapse/{workspaces => workspace}/.test/managedvnet/dependencies.bicep (100%) rename modules/synapse/{workspaces => workspace}/.test/managedvnet/main.test.bicep (100%) rename modules/synapse/{workspaces => workspace}/.test/min/dependencies.bicep (100%) rename modules/synapse/{workspaces => workspace}/.test/min/main.test.bicep (100%) rename modules/synapse/{workspaces => workspace}/README.md (99%) rename modules/synapse/{workspaces => workspace}/integration-runtimes/README.md (100%) rename modules/synapse/{workspaces => workspace}/integration-runtimes/main.bicep (100%) rename modules/synapse/{workspaces => workspace}/integration-runtimes/main.json (100%) rename modules/synapse/{workspaces => workspace}/integration-runtimes/version.json (100%) rename modules/synapse/{workspaces => workspace}/keys/README.md (100%) rename modules/synapse/{workspaces => workspace}/keys/main.bicep (100%) rename modules/synapse/{workspaces => workspace}/keys/main.json (100%) rename modules/synapse/{workspaces => workspace}/keys/version.json (100%) rename modules/synapse/{workspaces => workspace}/main.bicep (98%) rename modules/synapse/{workspaces => workspace}/main.json (100%) rename modules/synapse/{workspaces => workspace}/version.json (100%) rename modules/virtual-machine-images/{image-templates => image-template}/.bicep/nested_roleAssignments.bicep (100%) rename modules/virtual-machine-images/{image-templates => image-template}/.test/common/dependencies.bicep (100%) rename modules/virtual-machine-images/{image-templates => image-template}/.test/common/main.test.bicep (100%) rename modules/virtual-machine-images/{image-templates => image-template}/.test/main.test.bicep (100%) rename modules/virtual-machine-images/{image-templates => image-template}/.test/min/dependencies.bicep (100%) rename modules/virtual-machine-images/{image-templates => image-template}/.test/min/main.test.bicep (100%) rename modules/virtual-machine-images/{image-templates => image-template}/README.md (99%) rename modules/virtual-machine-images/{image-templates => image-template}/main.bicep (100%) rename modules/virtual-machine-images/{image-templates => image-template}/main.json (100%) rename modules/virtual-machine-images/{image-templates => image-template}/version.json (100%) rename modules/web/{connections => connection}/.bicep/nested_roleAssignments.bicep (100%) rename modules/web/{connections => connection}/.test/common/dependencies.bicep (100%) rename modules/web/{connections => connection}/.test/common/main.test.bicep (100%) rename modules/web/{connections => connection}/.test/main.test.bicep (100%) rename modules/web/{connections => connection}/README.md (99%) rename modules/web/{connections => connection}/main.bicep (100%) rename modules/web/{connections => connection}/main.json (100%) rename modules/web/{connections => connection}/version.json (100%) rename modules/web/{hosting-environments => hosting-environment}/.bicep/nested_roleAssignments.bicep (100%) rename modules/web/{hosting-environments => hosting-environment}/.test/asev2/dependencies.bicep (100%) rename modules/web/{hosting-environments => hosting-environment}/.test/asev2/main.test.bicep (100%) rename modules/web/{hosting-environments => hosting-environment}/.test/asev3/dependencies.bicep (100%) rename modules/web/{hosting-environments => hosting-environment}/.test/asev3/main.test.bicep (100%) rename modules/web/{hosting-environments => hosting-environment}/.test/main.test.bicep (100%) rename modules/web/{hosting-environments => hosting-environment}/README.md (99%) rename modules/web/{hosting-environments => hosting-environment}/configurations--customdnssuffix/README.md (100%) rename modules/web/{hosting-environments => hosting-environment}/configurations--customdnssuffix/main.bicep (100%) rename modules/web/{hosting-environments => hosting-environment}/configurations--customdnssuffix/main.json (100%) rename modules/web/{hosting-environments => hosting-environment}/configurations--customdnssuffix/version.json (100%) rename modules/web/{hosting-environments => hosting-environment}/configurations--networking/README.md (100%) rename modules/web/{hosting-environments => hosting-environment}/configurations--networking/main.bicep (100%) rename modules/web/{hosting-environments => hosting-environment}/configurations--networking/main.json (100%) rename modules/web/{hosting-environments => hosting-environment}/configurations--networking/version.json (100%) rename modules/web/{hosting-environments => hosting-environment}/main.bicep (100%) rename modules/web/{hosting-environments => hosting-environment}/main.json (100%) rename modules/web/{hosting-environments => hosting-environment}/version.json (100%) rename modules/web/{serverfarms => serverfarm}/.bicep/nested_roleAssignments.bicep (100%) rename modules/web/{serverfarms => serverfarm}/.test/common/dependencies.bicep (100%) rename modules/web/{serverfarms => serverfarm}/.test/common/main.test.bicep (100%) rename modules/web/{serverfarms => serverfarm}/.test/main.test.bicep (100%) rename modules/web/{serverfarms => serverfarm}/README.md (99%) rename modules/web/{serverfarms => serverfarm}/main.bicep (100%) rename modules/web/{serverfarms => serverfarm}/main.json (100%) rename modules/web/{serverfarms => serverfarm}/version.json (100%) rename modules/web/{sites => site}/.bicep/nested_roleAssignments.bicep (100%) rename modules/web/{sites => site}/.test/functionAppCommon/dependencies.bicep (100%) rename modules/web/{sites => site}/.test/functionAppCommon/main.test.bicep (100%) rename modules/web/{sites => site}/.test/functionAppMin/dependencies.bicep (100%) rename modules/web/{sites => site}/.test/functionAppMin/main.test.bicep (100%) rename modules/web/{sites => site}/.test/main.test.bicep (100%) rename modules/web/{sites => site}/.test/webAppCommon/dependencies.bicep (100%) rename modules/web/{sites => site}/.test/webAppCommon/main.test.bicep (100%) rename modules/web/{sites => site}/.test/webAppMin/dependencies.bicep (100%) rename modules/web/{sites => site}/.test/webAppMin/main.test.bicep (100%) rename modules/web/{sites => site}/README.md (99%) rename modules/web/{sites => site}/basic-publishing-credentials-policies/README.md (100%) rename modules/web/{sites => site}/basic-publishing-credentials-policies/main.bicep (100%) rename modules/web/{sites => site}/basic-publishing-credentials-policies/main.json (100%) rename modules/web/{sites => site}/basic-publishing-credentials-policies/version.json (100%) rename modules/web/{sites => site}/config--appsettings/README.md (100%) rename modules/web/{sites => site}/config--appsettings/main.bicep (100%) rename modules/web/{sites => site}/config--appsettings/main.json (100%) rename modules/web/{sites => site}/config--appsettings/version.json (100%) rename modules/web/{sites => site}/config--authsettingsv2/README.md (100%) rename modules/web/{sites => site}/config--authsettingsv2/main.bicep (100%) rename modules/web/{sites => site}/config--authsettingsv2/main.json (100%) rename modules/web/{sites => site}/config--authsettingsv2/version.json (100%) rename modules/web/{sites => site}/hybrid-connection-namespaces/relays/README.md (100%) rename modules/web/{sites => site}/hybrid-connection-namespaces/relays/main.bicep (100%) rename modules/web/{sites => site}/hybrid-connection-namespaces/relays/main.json (100%) rename modules/web/{sites => site}/hybrid-connection-namespaces/relays/version.json (100%) rename modules/web/{sites => site}/main.bicep (97%) rename modules/web/{sites => site}/main.json (100%) rename modules/web/{sites => site}/slots/.bicep/nested_roleAssignments.bicep (100%) rename modules/web/{sites => site}/slots/README.md (100%) rename modules/web/{sites => site}/slots/config--appsettings/README.md (100%) rename modules/web/{sites => site}/slots/config--appsettings/main.bicep (100%) rename modules/web/{sites => site}/slots/config--appsettings/main.json (100%) rename modules/web/{sites => site}/slots/config--appsettings/version.json (100%) rename modules/web/{sites => site}/slots/config--authsettingsv2/README.md (100%) rename modules/web/{sites => site}/slots/config--authsettingsv2/main.bicep (100%) rename modules/web/{sites => site}/slots/config--authsettingsv2/main.json (100%) rename modules/web/{sites => site}/slots/config--authsettingsv2/version.json (100%) rename modules/web/{sites => site}/slots/hybrid-connection-namespaces/relays/README.md (100%) rename modules/web/{sites => site}/slots/hybrid-connection-namespaces/relays/main.bicep (100%) rename modules/web/{sites => site}/slots/hybrid-connection-namespaces/relays/main.json (100%) rename modules/web/{sites => site}/slots/hybrid-connection-namespaces/relays/version.json (100%) rename modules/web/{sites => site}/slots/main.bicep (97%) rename modules/web/{sites => site}/slots/main.json (100%) rename modules/web/{sites => site}/slots/version.json (100%) rename modules/web/{sites => site}/version.json (100%) rename modules/web/{static-sites => static-site}/.bicep/nested_roleAssignments.bicep (100%) rename modules/web/{static-sites => static-site}/.test/common/dependencies.bicep (100%) rename modules/web/{static-sites => static-site}/.test/common/main.test.bicep (100%) rename modules/web/{static-sites => static-site}/.test/main.test.bicep (100%) rename modules/web/{static-sites => static-site}/.test/min/main.test.bicep (100%) rename modules/web/{static-sites => static-site}/README.md (99%) rename modules/web/{static-sites => static-site}/config/README.md (100%) rename modules/web/{static-sites => static-site}/config/main.bicep (100%) rename modules/web/{static-sites => static-site}/config/main.json (100%) rename modules/web/{static-sites => static-site}/config/version.json (100%) rename modules/web/{static-sites => static-site}/custom-domains/README.md (100%) rename modules/web/{static-sites => static-site}/custom-domains/main.bicep (100%) rename modules/web/{static-sites => static-site}/custom-domains/main.json (100%) rename modules/web/{static-sites => static-site}/custom-domains/version.json (100%) rename modules/web/{static-sites => static-site}/linked-backends/README.md (100%) rename modules/web/{static-sites => static-site}/linked-backends/main.bicep (100%) rename modules/web/{static-sites => static-site}/linked-backends/main.json (100%) rename modules/web/{static-sites => static-site}/linked-backends/version.json (100%) rename modules/web/{static-sites => static-site}/main.bicep (97%) rename modules/web/{static-sites => static-site}/main.json (100%) rename modules/web/{static-sites => static-site}/version.json (100%) diff --git a/Set-CARMLFoldersForPBRSingular.ps1 b/Set-CARMLFoldersForPBRSingular.ps1 new file mode 100644 index 0000000000..d88da42a1e --- /dev/null +++ b/Set-CARMLFoldersForPBRSingular.ps1 @@ -0,0 +1,420 @@ +<# +.SYNOPSIS +Re-format the name of every CARML module to match the requirements of the Public Bicep Registry + +.DESCRIPTION +The names are formatted as per the following rules: +- Add a '-' prefix to every upper-case character +- Make the entire name lower case + +For example, it re-formats +- 'AppConfiguration\configurationStores\keyValues\deploy.bicep' +to +- app-configuration\configuration-stores\key-values\deploy.bicep + +.PARAMETER ModulesFolderPath +Mandatory. The path to the modules who's folder names should be converted. + +.EXAMPLE +Set-CARMLFoldersForPBRSingular -ModulesFolderPath 'C:\dev\ip\Azure-ResourceModules\ResourceModules\modules' + +Convert all folders in path 'C:\dev\ip\Azure-ResourceModules\ResourceModules\modules' + +.EXAMPLE +Set-CARMLFoldersForPBRSingular -ModulesFolderPath 'C:\dev\ip\GitHub\Azure\ResourceModules\modules' -WorkflowsPath 'C:\dev\ip\GitHub\Azure\ResourceModules\.github\workflows' -PipelinesPath 'C:\dev\ip\GitHub\Azure\ResourceModules\.azuredevops\modulePipelines' -UtilitiesPath 'C:\dev\ip\GitHub\Azure\ResourceModules\utilities' -Verbose + +Convert all folders in path 'C:\dev\ip\Azure-ResourceModules\ResourceModules\modules' and replaces all pipeline, workflows and utility references + +.EXAMPLE +Set-CARMLFoldersForPBRSingular -ResourceProviderPath 'C:\dev\ip\Azure-ResourceModules\ResourceModules\modules\KeyVault' + +Convert all folders in path 'C:\dev\ip\Azure-ResourceModules\ResourceModules\modules\KeyVault' included + +.NOTES +This script should only be run AFTER the 'Microsoft.' provider namespace prefix was removed. +Identifiers such as 'DBforPostgreSQL' becomes 'd-bfor-postgre-s-q-l' which should probably be manually reverted to 'db-for-postgre-sql'. +#> +function Set-CARMLFoldersForPBRSingular { + + [CmdletBinding(SupportsShouldProcess = $true)] + param ( + [Parameter(Mandatory = $true)] + [string] $ModulesFolderPath, + + [Parameter(Mandatory = $false)] + [string] $ResourceProviderPath = '', + + [Parameter(Mandatory = $false)] + [string] $WorkflowsPath = '', + + [Parameter(Mandatory = $false)] + [string] $PipelinesPath = '', + + [Parameter(Mandatory = $false)] + [string] $UtilitiesPath = '' + ) + + $specialConversionHash = @{ + 'a' = 'a' + 'aaaa' = 'aaaa' + 'access-policies' = 'access-policy' + 'accounts' = 'account' + 'action-groups' = 'action-group' + 'activity-log-alerts' = 'activity-log-alert' + 'administrators' = 'administrator' + 'agent-pools' = 'agent-pool' + 'api-version-sets' = 'api-version-set' + 'apis' = 'api' + 'application-gateway-web-application-firewall-policies' = 'application-gateway-web-application-firewall-policy' + 'application-gateways' = 'application-gateway' + 'application-groups' = 'application-group' + 'application-security-groups' = 'application-security-group' + 'application-types' = 'application-type' + 'applications' = 'application' + 'artifactsources' = 'artifactsource' + 'authorization-rules' = 'authorization-rule' + 'authorization-servers' = 'authorization-server' + 'automation-accounts' = 'automation-account' + 'availability-sets' = 'availability-set' + 'azure-firewalls' = 'azure-firewall' + 'azure-security-center' = 'azure-security-center' + 'backend-address-pools' = 'backend-address-pool' + 'backends' = 'backend' + 'backup-config' = 'backup-config' + 'backup-long-term-retention-policies' = 'backup-long-term-retention-policy' + 'backup-policies' = 'backup-policy' + 'backup-short-term-retention-policies' = 'backup-short-term-retention-policy' + 'backup-storage-config' = 'backup-storage-config' + 'backup-vaults' = 'backup-vault' + 'basic-publishing-credentials-policies' = 'basic-publishing-credentials-policy' + 'bastion-hosts' = 'bastion-host' + 'batch-accounts' = 'batch-account' + 'blob-services' = 'blob-service' + 'budgets' = 'budget' + 'caa' = 'caa' + 'caches' = 'cache' + 'capacities' = 'capacity' + 'capacity-pools' = 'capacity-pool' + 'clusters' = 'cluster' + 'cname' = 'cname' + 'collections' = 'collection' + 'components' = 'component' + 'computes' = 'compute' + 'config' = 'config' + 'config--appsettings' = 'config--appsetting' + 'config--authsettingsv2' = 'config--authsettingsv2' + 'configuration-stores' = 'configuration-store' + 'configurations' = 'configuration' + 'configurations--customdnssuffix' = 'configurations--customdnssuffix' + 'configurations--networking' = 'configurations--networking' + 'connection-monitors' = 'connection-monitor' + 'connections' = 'connection' + 'connectivity-configurations' = 'connectivity-configuration' + 'consumergroups' = 'consumergroup' + 'container-apps' = 'container-app' + 'container-groups' = 'container-group' + 'containers' = 'container' + 'costs' = 'cost' + 'custom-domains' = 'custom-domain' + 'data-collection-endpoints' = 'data-collection-endpoint' + 'data-collection-rules' = 'data-collection-rule' + 'data-exports' = 'data-export' + 'data-sources' = 'data-source' + 'database-accounts' = 'database-account' + 'databases' = 'database' + 'ddos-protection-plans' = 'ddos-protection-plan' + 'deployment-scripts' = 'deployment-script' + 'diagnostic-settings' = 'diagnostic-setting' + 'dicomservices' = 'dicomservice' + 'digital-twins-instances' = 'digital-twins-instance' + 'disaster-recovery-configs' = 'disaster-recovery-config' + 'disk-encryption-sets' = 'disk-encryption-set' + 'disks' = 'disk' + 'dns-forwarding-rulesets' = 'dns-forwarding-ruleset' + 'dns-resolvers' = 'dns-resolver' + 'dns-zones' = 'dns-zone' + 'domain-services' = 'domain-service' + 'domains' = 'domain' + 'elastic-pools' = 'elastic-pool' + 'encryption-protector' = 'encryption-protector' + 'endpoints' = 'endpoint' + 'endpoints--event-grid' = 'endpoints--event-grid' + 'endpoints--event-hub' = 'endpoints--event-hub' + 'endpoints--service-bus' = 'endpoints--service-bus' + 'eventhubs' = 'eventhub' + 'eventSubscriptions' = 'eventSubscription' + 'express-route-circuits' = 'express-route-circuit' + 'express-route-gateway' = 'express-route-gateway' + 'extensions' = 'extension' + 'factories' = 'factory' + 'fhirdestinations' = 'fhirdestination' + 'fhirservices' = 'fhirservice' + 'file-services' = 'file-service' + 'firewall-policies' = 'firewall-policy' + 'firewall-rules' = 'firewall-rule' + 'flexible-servers' = 'flexible-server' + 'flow-logs' = 'flow-log' + 'flux-configurations' = 'flux-configuration' + 'forwarding-rules' = 'forwarding-rule' + 'front-doors' = 'front-door' + 'galleries' = 'gallery' + 'graphs' = 'graph' + 'gremlin-databases' = 'gremlin-database' + 'groups' = 'group' + 'health-bots' = 'health-bot' + 'host-pools' = 'host-pool' + 'hosting-environments' = 'hosting-environment' + 'hub-route-tables' = 'hub-route-table' + 'hub-virtual-network-connections' = 'hub-virtual-network-connection' + 'hybrid-connections' = 'hybrid-connection' + 'hybrid-connection-namespaces' = 'hybrid-connection-namespace' + 'identity-providers' = 'identity-provider' + 'image-templates' = 'image-template' + 'images' = 'image' + 'immutability-policies' = 'immutability-policy' + 'inbound-nat-rules' = 'inbound-nat-rule' + 'integration-runtimes' = 'integration-runtime' + 'iotconnectors' = 'iotconnector' + 'ip-groups' = 'ip-group' + 'job-schedules' = 'job-schedule' + 'key-values' = 'key-value' + 'keys' = 'key' + 'labs' = 'lab' + 'linked-backends' = 'linked-backend' + 'linked-services' = 'linked-service' + 'linked-storage-accounts' = 'linked-storage-account' + 'load-balancers' = 'load-balancer' + 'local-network-gateways' = 'local-network-gateway' + 'local-users' = 'local-user' + 'locks' = 'lock' + 'maintenance-configurations' = 'maintenance-configuration' + 'managed-clusters' = 'managed-cluster' + 'managed-environments' = 'managed-environment' + 'managed-instances' = 'managed-instance' + 'managed-private-endpoints' = 'managed-private-endpoint' + 'managed-virtual-networks' = 'managed-virtual-network' + 'management-group' = 'management-group' + 'management-groups' = 'management-group' + 'management-policies' = 'management-policy' + 'metric-alerts' = 'metric-alert' + 'migration-configurations' = 'migration-configuration' + 'modules' = 'module' + 'mongodb-databases' = 'mongodb-database' + 'mx' = 'mx' + 'named-values' = 'named-value' + 'namespaces' = 'namespace' + 'nat-gateways' = 'nat-gateway' + 'nat-rules' = 'nat-rule' + 'net-app-accounts' = 'net-app-account' + 'network-groups' = 'network-group' + 'network-interfaces' = 'network-interface' + 'network-managers' = 'network-manager' + 'network-rule-sets' = 'network-rule-set' + 'network-security-groups' = 'network-security-group' + 'network-watchers' = 'network-watcher' + 'notificationchannels' = 'notificationchannel' + 'ns' = 'ns' + 'origins' = 'origin' + 'policies' = 'policy' + 'policy-assignments' = 'policy-assignment' + 'policy-definitions' = 'policy-definition' + 'policy-exemptions' = 'policy-exemption' + 'policy-set-definitions' = 'policy-set-definition' + 'policysets' = 'policyset' + 'portalsettings' = 'portalsetting' + 'private-dns-zone-groups' = 'private-dns-zone-group' + 'private-dns-zones' = 'private-dns-zone' + 'private-endpoints' = 'private-endpoint' + 'private-link-hubs' = 'private-link-hub' + 'private-link-scopes' = 'private-link-scope' + 'private-link-services' = 'private-link-service' + 'products' = 'product' + 'profiles' = 'profile' + 'protected-items' = 'protected-item' + 'protection-containers' = 'protection-container' + 'proximity-placement-groups' = 'proximity-placement-group' + 'ptr' = 'ptr' + 'public-ip-addresses' = 'public-ip-address' + 'public-ip-prefixes' = 'public-ip-prefix' + 'queue-services' = 'queue-service' + 'queues' = 'queue' + 'redis' = 'redis' + 'registration-definitions' = 'registration-definition' + 'registries' = 'registry' + 'relays' = 'relay' + 'remediations' = 'remediation' + 'replication-alert-settings' = 'replication-alert-setting' + 'replication-fabrics' = 'replication-fabric' + 'replication-policies' = 'replication-policy' + 'replication-protection-container-mappings' = 'replication-protection-container-mapping' + 'replication-protection-containers' = 'replication-protection-container' + 'replications' = 'replication' + 'resource-group' = 'resource-group' + 'resource-groups' = 'resource-group' + 'role-assignments' = 'role-assignment' + 'role-definitions' = 'role-definition' + 'route-tables' = 'route-table' + 'rule-collection-groups' = 'rule-collection-group' + 'rule-collections' = 'rule-collection' + 'rules' = 'rule' + 'runbooks' = 'runbook' + 'saved-searches' = 'saved-searche' + 'scaling-plans' = 'scaling-plan' + 'scheduled-query-rules' = 'scheduled-query-rule' + 'schedules' = 'schedule' + 'scope-connections' = 'scope-connection' + 'scoped-resources' = 'scoped-resource' + 'secrets' = 'secret' + 'security-admin-configurations' = 'security-admin-configuration' + 'security-alert-policies' = 'security-alert-policy' + 'security-rules' = 'security-rule' + 'serverfarms' = 'serverfarm' + 'servers' = 'server' + 'service' = 'service' + 'service-endpoint-policies' = 'service-endpoint-policy' + 'shares' = 'share' + 'signal-r' = 'signal-r' + 'sites' = 'site' + 'slots' = 'slot' + 'soa' = 'soa' + 'software-update-configurations' = 'software-update-configuration' + 'solutions' = 'solution' + 'sql-databases' = 'sql-database' + 'srv' = 'srv' + 'ssh-public-keys' = 'ssh-public-key' + 'static-members' = 'static-member' + 'static-sites' = 'static-site' + 'storage-accounts' = 'storage-account' + 'storage-insight-configs' = 'storage-insight-config' + 'subnets' = 'subnet' + 'subscription' = 'subscription' + 'subscriptions' = 'subscription' + 'system-topics' = 'system-topic' + 'table-services' = 'table-service' + 'tables' = 'table' + 'tags' = 'tags' + 'topics' = 'topic' + 'trafficmanagerprofiles' = 'trafficmanagerprofile' + 'txt' = 'txt' + 'user-assigned-identities' = 'user-assigned-identity' + 'variables' = 'variable' + 'vaults' = 'vault' + 'virtual-hubs' = 'virtual-hub' + 'virtual-machine-scale-sets' = 'virtual-machine-scale-set' + 'virtual-machines' = 'virtual-machine' + 'virtual-network-gateways' = 'virtual-network-gateway' + 'virtual-network-links' = 'virtual-network-link' + 'virtual-network-peerings' = 'virtual-network-peering' + 'virtual-network-rules' = 'virtual-network-rule' + 'virtual-networks' = 'virtual-network' + 'virtual-wans' = 'virtual-wan' + 'virtualnetworks' = 'virtualnetwork' + 'volumes' = 'volume' + 'vpn-gateways' = 'vpn-gateway' + 'vpn-sites' = 'vpn-site' + 'vulnerability-assessments' = 'vulnerability-assessment' + 'wcf-relays' = 'wcf-relay' + 'web-pub-sub' = 'web-pub-sub' + 'webhooks' = 'webhook' + 'webtests' = 'webtest' + 'workflows' = 'workflow' + 'workspaces' = 'workspace' + } + + $relevantFolderPaths = @() + # Get all module folder names + if ($ResourceProviderPath -ne '') { + $relevantFolderPaths += (Get-ChildItem -Path $ResourceProviderPath -Recurse -Directory).FullName | Where-Object { + $_ -notlike '*.bicep*' -and + $_ -notlike '*.shared*' -and + $_ -notlike '*.test*' + } + Write-Verbose ("relevantFolderPaths $relevantFolderPaths") -Verbose + Write-Verbose ("ResourceProviderPath $ResourceProviderPath") -Verbose + $relevantFolderPaths += $ResourceProviderPath + Write-Verbose ("relevantFolderPaths $relevantFolderPaths") -Verbose + + } else { + $relevantFolderPaths = (Get-ChildItem -Path $ModulesFolderPath -Recurse -Directory).FullName | Where-Object { + $_ -notlike '*.bicep*' -and + $_ -notlike '*.shared*' -and + $_ -notlike '*.test*' + } + } + $relevantFolderPaths | Sort-Object -Descending + + # Iterate on all folder names + foreach ($folderPath in $relevantFolderPaths) { + + # Convert each folder name to its kebab-case + $folderName = Split-Path $folderPath -Leaf + + if ($specialConversionHash.ContainsKey($folderName)) { + $newName = $specialConversionHash[$folderName] + } else { + # (?via Bicep module ```bicep -module domainServices './aad/domain-services/main.bicep' = { +module domainServices './aad/domain-service/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-aaddscom' params: { // Required parameters diff --git a/modules/aad/domain-services/main.bicep b/modules/aad/domain-service/main.bicep similarity index 100% rename from modules/aad/domain-services/main.bicep rename to modules/aad/domain-service/main.bicep diff --git a/modules/aad/domain-services/main.json b/modules/aad/domain-service/main.json similarity index 100% rename from modules/aad/domain-services/main.json rename to modules/aad/domain-service/main.json diff --git a/modules/aad/domain-services/version.json b/modules/aad/domain-service/version.json similarity index 100% rename from modules/aad/domain-services/version.json rename to modules/aad/domain-service/version.json diff --git a/modules/analysis-services/servers/.bicep/nested_roleAssignments.bicep b/modules/analysis-services/server/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/analysis-services/servers/.bicep/nested_roleAssignments.bicep rename to modules/analysis-services/server/.bicep/nested_roleAssignments.bicep diff --git a/modules/analysis-services/servers/.test/common/dependencies.bicep b/modules/analysis-services/server/.test/common/dependencies.bicep similarity index 100% rename from modules/analysis-services/servers/.test/common/dependencies.bicep rename to modules/analysis-services/server/.test/common/dependencies.bicep diff --git a/modules/analysis-services/servers/.test/common/main.test.bicep b/modules/analysis-services/server/.test/common/main.test.bicep similarity index 100% rename from modules/analysis-services/servers/.test/common/main.test.bicep rename to modules/analysis-services/server/.test/common/main.test.bicep diff --git a/modules/analysis-services/servers/.test/main.test.bicep b/modules/analysis-services/server/.test/main.test.bicep similarity index 100% rename from modules/analysis-services/servers/.test/main.test.bicep rename to modules/analysis-services/server/.test/main.test.bicep diff --git a/modules/analysis-services/servers/.test/max/dependencies.bicep b/modules/analysis-services/server/.test/max/dependencies.bicep similarity index 100% rename from modules/analysis-services/servers/.test/max/dependencies.bicep rename to modules/analysis-services/server/.test/max/dependencies.bicep diff --git a/modules/analysis-services/servers/.test/max/main.test.bicep b/modules/analysis-services/server/.test/max/main.test.bicep similarity index 100% rename from modules/analysis-services/servers/.test/max/main.test.bicep rename to modules/analysis-services/server/.test/max/main.test.bicep diff --git a/modules/analysis-services/servers/.test/min/main.test.bicep b/modules/analysis-services/server/.test/min/main.test.bicep similarity index 100% rename from modules/analysis-services/servers/.test/min/main.test.bicep rename to modules/analysis-services/server/.test/min/main.test.bicep diff --git a/modules/analysis-services/servers/README.md b/modules/analysis-services/server/README.md similarity index 98% rename from modules/analysis-services/servers/README.md rename to modules/analysis-services/server/README.md index fb956d6d71..2c395523bb 100644 --- a/modules/analysis-services/servers/README.md +++ b/modules/analysis-services/server/README.md @@ -176,7 +176,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module servers './analysis-services/servers/main.bicep' = { +module servers './analysis-services/server/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-asscom' params: { // Required parameters @@ -279,7 +279,7 @@ module servers './analysis-services/servers/main.bicep' = { via Bicep module ```bicep -module servers './analysis-services/servers/main.bicep' = { +module servers './analysis-services/server/main.bicep' = { name: '${uniqueString(deployment().name)}-test-assmax' params: { // Required parameters @@ -416,7 +416,7 @@ module servers './analysis-services/servers/main.bicep' = { via Bicep module ```bicep -module servers './analysis-services/servers/main.bicep' = { +module servers './analysis-services/server/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-assmin' params: { // Required parameters diff --git a/modules/analysis-services/servers/main.bicep b/modules/analysis-services/server/main.bicep similarity index 100% rename from modules/analysis-services/servers/main.bicep rename to modules/analysis-services/server/main.bicep diff --git a/modules/analysis-services/servers/main.json b/modules/analysis-services/server/main.json similarity index 100% rename from modules/analysis-services/servers/main.json rename to modules/analysis-services/server/main.json diff --git a/modules/analysis-services/servers/version.json b/modules/analysis-services/server/version.json similarity index 100% rename from modules/analysis-services/servers/version.json rename to modules/analysis-services/server/version.json diff --git a/modules/api-management/service/api-version-sets/README.md b/modules/api-management/service/api-version-set/README.md similarity index 100% rename from modules/api-management/service/api-version-sets/README.md rename to modules/api-management/service/api-version-set/README.md diff --git a/modules/api-management/service/api-version-sets/main.bicep b/modules/api-management/service/api-version-set/main.bicep similarity index 100% rename from modules/api-management/service/api-version-sets/main.bicep rename to modules/api-management/service/api-version-set/main.bicep diff --git a/modules/api-management/service/api-version-sets/main.json b/modules/api-management/service/api-version-set/main.json similarity index 100% rename from modules/api-management/service/api-version-sets/main.json rename to modules/api-management/service/api-version-set/main.json diff --git a/modules/api-management/service/api-version-sets/version.json b/modules/api-management/service/api-version-set/version.json similarity index 100% rename from modules/api-management/service/api-version-sets/version.json rename to modules/api-management/service/api-version-set/version.json diff --git a/modules/api-management/service/apis/README.md b/modules/api-management/service/api/README.md similarity index 100% rename from modules/api-management/service/apis/README.md rename to modules/api-management/service/api/README.md diff --git a/modules/api-management/service/apis/main.bicep b/modules/api-management/service/api/main.bicep similarity index 98% rename from modules/api-management/service/apis/main.bicep rename to modules/api-management/service/api/main.bicep index c967242b15..f61e9bf0d5 100644 --- a/modules/api-management/service/apis/main.bicep +++ b/modules/api-management/service/api/main.bicep @@ -147,7 +147,7 @@ resource api 'Microsoft.ApiManagement/service/apis@2021-08-01' = { } } -module policy 'policies/main.bicep' = [for (policy, index) in policies: { +module policy 'policy/main.bicep' = [for (policy, index) in policies: { name: '${deployment().name}-Policy-${index}' params: { apiManagementServiceName: apiManagementServiceName diff --git a/modules/api-management/service/apis/main.json b/modules/api-management/service/api/main.json similarity index 100% rename from modules/api-management/service/apis/main.json rename to modules/api-management/service/api/main.json diff --git a/modules/api-management/service/apis/policies/README.md b/modules/api-management/service/api/policies/README.md similarity index 100% rename from modules/api-management/service/apis/policies/README.md rename to modules/api-management/service/api/policies/README.md diff --git a/modules/api-management/service/apis/policies/main.bicep b/modules/api-management/service/api/policies/main.bicep similarity index 100% rename from modules/api-management/service/apis/policies/main.bicep rename to modules/api-management/service/api/policies/main.bicep diff --git a/modules/api-management/service/apis/policies/main.json b/modules/api-management/service/api/policies/main.json similarity index 100% rename from modules/api-management/service/apis/policies/main.json rename to modules/api-management/service/api/policies/main.json diff --git a/modules/api-management/service/apis/policies/version.json b/modules/api-management/service/api/policies/version.json similarity index 100% rename from modules/api-management/service/apis/policies/version.json rename to modules/api-management/service/api/policies/version.json diff --git a/modules/api-management/service/apis/version.json b/modules/api-management/service/api/version.json similarity index 100% rename from modules/api-management/service/apis/version.json rename to modules/api-management/service/api/version.json diff --git a/modules/api-management/service/authorization-servers/README.md b/modules/api-management/service/authorization-server/README.md similarity index 100% rename from modules/api-management/service/authorization-servers/README.md rename to modules/api-management/service/authorization-server/README.md diff --git a/modules/api-management/service/authorization-servers/main.bicep b/modules/api-management/service/authorization-server/main.bicep similarity index 100% rename from modules/api-management/service/authorization-servers/main.bicep rename to modules/api-management/service/authorization-server/main.bicep diff --git a/modules/api-management/service/authorization-servers/main.json b/modules/api-management/service/authorization-server/main.json similarity index 100% rename from modules/api-management/service/authorization-servers/main.json rename to modules/api-management/service/authorization-server/main.json diff --git a/modules/api-management/service/authorization-servers/version.json b/modules/api-management/service/authorization-server/version.json similarity index 100% rename from modules/api-management/service/authorization-servers/version.json rename to modules/api-management/service/authorization-server/version.json diff --git a/modules/api-management/service/backends/README.md b/modules/api-management/service/backend/README.md similarity index 100% rename from modules/api-management/service/backends/README.md rename to modules/api-management/service/backend/README.md diff --git a/modules/api-management/service/backends/main.bicep b/modules/api-management/service/backend/main.bicep similarity index 100% rename from modules/api-management/service/backends/main.bicep rename to modules/api-management/service/backend/main.bicep diff --git a/modules/api-management/service/backends/main.json b/modules/api-management/service/backend/main.json similarity index 100% rename from modules/api-management/service/backends/main.json rename to modules/api-management/service/backend/main.json diff --git a/modules/api-management/service/backends/version.json b/modules/api-management/service/backend/version.json similarity index 100% rename from modules/api-management/service/backends/version.json rename to modules/api-management/service/backend/version.json diff --git a/modules/api-management/service/caches/README.md b/modules/api-management/service/cache/README.md similarity index 100% rename from modules/api-management/service/caches/README.md rename to modules/api-management/service/cache/README.md diff --git a/modules/api-management/service/caches/main.bicep b/modules/api-management/service/cache/main.bicep similarity index 100% rename from modules/api-management/service/caches/main.bicep rename to modules/api-management/service/cache/main.bicep diff --git a/modules/api-management/service/caches/main.json b/modules/api-management/service/cache/main.json similarity index 100% rename from modules/api-management/service/caches/main.json rename to modules/api-management/service/cache/main.json diff --git a/modules/api-management/service/caches/version.json b/modules/api-management/service/cache/version.json similarity index 100% rename from modules/api-management/service/caches/version.json rename to modules/api-management/service/cache/version.json diff --git a/modules/api-management/service/identity-providers/README.md b/modules/api-management/service/identity-provider/README.md similarity index 100% rename from modules/api-management/service/identity-providers/README.md rename to modules/api-management/service/identity-provider/README.md diff --git a/modules/api-management/service/identity-providers/main.bicep b/modules/api-management/service/identity-provider/main.bicep similarity index 100% rename from modules/api-management/service/identity-providers/main.bicep rename to modules/api-management/service/identity-provider/main.bicep diff --git a/modules/api-management/service/identity-providers/main.json b/modules/api-management/service/identity-provider/main.json similarity index 100% rename from modules/api-management/service/identity-providers/main.json rename to modules/api-management/service/identity-provider/main.json diff --git a/modules/api-management/service/identity-providers/version.json b/modules/api-management/service/identity-provider/version.json similarity index 100% rename from modules/api-management/service/identity-providers/version.json rename to modules/api-management/service/identity-provider/version.json diff --git a/modules/api-management/service/main.bicep b/modules/api-management/service/main.bicep index 84e852cdaf..3d7e8e488c 100644 --- a/modules/api-management/service/main.bicep +++ b/modules/api-management/service/main.bicep @@ -254,7 +254,7 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { } } -module service_apis 'apis/main.bicep' = [for (api, index) in apis: { +module service_apis 'api/main.bicep' = [for (api, index) in apis: { name: '${uniqueString(deployment().name, location)}-Apim-Api-${index}' params: { apiManagementServiceName: service.name @@ -289,7 +289,7 @@ module service_apis 'apis/main.bicep' = [for (api, index) in apis: { ] }] -module service_apiVersionSets 'api-version-sets/main.bicep' = [for (apiVersionSet, index) in apiVersionSets: { +module service_apiVersionSets 'api-version-set/main.bicep' = [for (apiVersionSet, index) in apiVersionSets: { name: '${uniqueString(deployment().name, location)}-Apim-ApiVersionSet-${index}' params: { apiManagementServiceName: service.name @@ -299,7 +299,7 @@ module service_apiVersionSets 'api-version-sets/main.bicep' = [for (apiVersionSe } }] -module service_authorizationServers 'authorization-servers/main.bicep' = [for (authorizationServer, index) in authorizationServerList: { +module service_authorizationServers 'authorization-server/main.bicep' = [for (authorizationServer, index) in authorizationServerList: { name: '${uniqueString(deployment().name, location)}-Apim-AuthorizationServer-${index}' params: { apiManagementServiceName: service.name @@ -329,7 +329,7 @@ module service_authorizationServers 'authorization-servers/main.bicep' = [for (a } }] -module service_backends 'backends/main.bicep' = [for (backend, index) in backends: { +module service_backends 'backend/main.bicep' = [for (backend, index) in backends: { name: '${uniqueString(deployment().name, location)}-Apim-Backend-${index}' params: { apiManagementServiceName: service.name @@ -350,7 +350,7 @@ module service_backends 'backends/main.bicep' = [for (backend, index) in backend } }] -module service_caches 'caches/main.bicep' = [for (cache, index) in caches: { +module service_caches 'cache/main.bicep' = [for (cache, index) in caches: { name: '${uniqueString(deployment().name, location)}-Apim-Cache-${index}' params: { apiManagementServiceName: service.name @@ -363,7 +363,7 @@ module service_caches 'caches/main.bicep' = [for (cache, index) in caches: { } }] -module service_identityProviders 'identity-providers/main.bicep' = [for (identityProvider, index) in identityProviders: { +module service_identityProviders 'identity-provider/main.bicep' = [for (identityProvider, index) in identityProviders: { name: '${uniqueString(deployment().name, location)}-Apim-IdentityProvider-${index}' params: { apiManagementServiceName: service.name @@ -383,7 +383,7 @@ module service_identityProviders 'identity-providers/main.bicep' = [for (identit } }] -module service_namedValues 'named-values/main.bicep' = [for (namedValue, index) in namedValues: { +module service_namedValues 'named-value/main.bicep' = [for (namedValue, index) in namedValues: { name: '${uniqueString(deployment().name, location)}-Apim-NamedValue-${index}' params: { apiManagementServiceName: service.name @@ -397,7 +397,7 @@ module service_namedValues 'named-values/main.bicep' = [for (namedValue, index) } }] -module service_portalsettings 'portalsettings/main.bicep' = [for (portalsetting, index) in portalsettings: { +module service_portalsettings 'portalsetting/main.bicep' = [for (portalsetting, index) in portalsettings: { name: '${uniqueString(deployment().name, location)}-Apim-PortalSetting-${index}' params: { apiManagementServiceName: service.name @@ -407,7 +407,7 @@ module service_portalsettings 'portalsettings/main.bicep' = [for (portalsetting, } }] -module service_policies 'policies/main.bicep' = [for (policy, index) in policies: { +module service_policies 'policy/main.bicep' = [for (policy, index) in policies: { name: '${uniqueString(deployment().name, location)}-Apim-Policy-${index}' params: { apiManagementServiceName: service.name @@ -417,7 +417,7 @@ module service_policies 'policies/main.bicep' = [for (policy, index) in policies } }] -module service_products 'products/main.bicep' = [for (product, index) in products: { +module service_products 'product/main.bicep' = [for (product, index) in products: { name: '${uniqueString(deployment().name, location)}-Apim-Product-${index}' params: { apiManagementServiceName: service.name @@ -437,7 +437,7 @@ module service_products 'products/main.bicep' = [for (product, index) in product ] }] -module service_subscriptions 'subscriptions/main.bicep' = [for (subscription, index) in subscriptions: { +module service_subscriptions 'subscription/main.bicep' = [for (subscription, index) in subscriptions: { name: '${uniqueString(deployment().name, location)}-Apim-Subscription-${index}' params: { apiManagementServiceName: service.name diff --git a/modules/api-management/service/named-values/README.md b/modules/api-management/service/named-value/README.md similarity index 100% rename from modules/api-management/service/named-values/README.md rename to modules/api-management/service/named-value/README.md diff --git a/modules/api-management/service/named-values/main.bicep b/modules/api-management/service/named-value/main.bicep similarity index 100% rename from modules/api-management/service/named-values/main.bicep rename to modules/api-management/service/named-value/main.bicep diff --git a/modules/api-management/service/named-values/main.json b/modules/api-management/service/named-value/main.json similarity index 100% rename from modules/api-management/service/named-values/main.json rename to modules/api-management/service/named-value/main.json diff --git a/modules/api-management/service/named-values/version.json b/modules/api-management/service/named-value/version.json similarity index 100% rename from modules/api-management/service/named-values/version.json rename to modules/api-management/service/named-value/version.json diff --git a/modules/api-management/service/policies/README.md b/modules/api-management/service/policy/README.md similarity index 100% rename from modules/api-management/service/policies/README.md rename to modules/api-management/service/policy/README.md diff --git a/modules/api-management/service/policies/main.bicep b/modules/api-management/service/policy/main.bicep similarity index 100% rename from modules/api-management/service/policies/main.bicep rename to modules/api-management/service/policy/main.bicep diff --git a/modules/api-management/service/policies/main.json b/modules/api-management/service/policy/main.json similarity index 100% rename from modules/api-management/service/policies/main.json rename to modules/api-management/service/policy/main.json diff --git a/modules/api-management/service/policies/version.json b/modules/api-management/service/policy/version.json similarity index 100% rename from modules/api-management/service/policies/version.json rename to modules/api-management/service/policy/version.json diff --git a/modules/api-management/service/portalsettings/README.md b/modules/api-management/service/portalsetting/README.md similarity index 100% rename from modules/api-management/service/portalsettings/README.md rename to modules/api-management/service/portalsetting/README.md diff --git a/modules/api-management/service/portalsettings/main.bicep b/modules/api-management/service/portalsetting/main.bicep similarity index 100% rename from modules/api-management/service/portalsettings/main.bicep rename to modules/api-management/service/portalsetting/main.bicep diff --git a/modules/api-management/service/portalsettings/main.json b/modules/api-management/service/portalsetting/main.json similarity index 100% rename from modules/api-management/service/portalsettings/main.json rename to modules/api-management/service/portalsetting/main.json diff --git a/modules/api-management/service/portalsettings/version.json b/modules/api-management/service/portalsetting/version.json similarity index 100% rename from modules/api-management/service/portalsettings/version.json rename to modules/api-management/service/portalsetting/version.json diff --git a/modules/api-management/service/products/README.md b/modules/api-management/service/product/README.md similarity index 100% rename from modules/api-management/service/products/README.md rename to modules/api-management/service/product/README.md diff --git a/modules/api-management/service/products/apis/README.md b/modules/api-management/service/product/apis/README.md similarity index 100% rename from modules/api-management/service/products/apis/README.md rename to modules/api-management/service/product/apis/README.md diff --git a/modules/api-management/service/products/apis/main.bicep b/modules/api-management/service/product/apis/main.bicep similarity index 100% rename from modules/api-management/service/products/apis/main.bicep rename to modules/api-management/service/product/apis/main.bicep diff --git a/modules/api-management/service/products/apis/main.json b/modules/api-management/service/product/apis/main.json similarity index 100% rename from modules/api-management/service/products/apis/main.json rename to modules/api-management/service/product/apis/main.json diff --git a/modules/api-management/service/products/apis/version.json b/modules/api-management/service/product/apis/version.json similarity index 100% rename from modules/api-management/service/products/apis/version.json rename to modules/api-management/service/product/apis/version.json diff --git a/modules/api-management/service/products/groups/README.md b/modules/api-management/service/product/groups/README.md similarity index 100% rename from modules/api-management/service/products/groups/README.md rename to modules/api-management/service/product/groups/README.md diff --git a/modules/api-management/service/products/groups/main.bicep b/modules/api-management/service/product/groups/main.bicep similarity index 100% rename from modules/api-management/service/products/groups/main.bicep rename to modules/api-management/service/product/groups/main.bicep diff --git a/modules/api-management/service/products/groups/main.json b/modules/api-management/service/product/groups/main.json similarity index 100% rename from modules/api-management/service/products/groups/main.json rename to modules/api-management/service/product/groups/main.json diff --git a/modules/api-management/service/products/groups/version.json b/modules/api-management/service/product/groups/version.json similarity index 100% rename from modules/api-management/service/products/groups/version.json rename to modules/api-management/service/product/groups/version.json diff --git a/modules/api-management/service/products/main.bicep b/modules/api-management/service/product/main.bicep similarity index 97% rename from modules/api-management/service/products/main.bicep rename to modules/api-management/service/product/main.bicep index 779f20fdd8..0a064939bc 100644 --- a/modules/api-management/service/products/main.bicep +++ b/modules/api-management/service/product/main.bicep @@ -67,7 +67,7 @@ resource product 'Microsoft.ApiManagement/service/products@2021-08-01' = { } } -module product_apis 'apis/main.bicep' = [for (api, index) in apis: { +module product_apis 'api/main.bicep' = [for (api, index) in apis: { name: '${deployment().name}-Api-${index}' params: { apiManagementServiceName: apiManagementServiceName @@ -77,7 +77,7 @@ module product_apis 'apis/main.bicep' = [for (api, index) in apis: { } }] -module product_groups 'groups/main.bicep' = [for (group, index) in groups: { +module product_groups 'group/main.bicep' = [for (group, index) in groups: { name: '${deployment().name}-Group-${index}' params: { apiManagementServiceName: apiManagementServiceName diff --git a/modules/api-management/service/products/main.json b/modules/api-management/service/product/main.json similarity index 100% rename from modules/api-management/service/products/main.json rename to modules/api-management/service/product/main.json diff --git a/modules/api-management/service/products/version.json b/modules/api-management/service/product/version.json similarity index 100% rename from modules/api-management/service/products/version.json rename to modules/api-management/service/product/version.json diff --git a/modules/api-management/service/subscriptions/README.md b/modules/api-management/service/subscription/README.md similarity index 100% rename from modules/api-management/service/subscriptions/README.md rename to modules/api-management/service/subscription/README.md diff --git a/modules/api-management/service/subscriptions/main.bicep b/modules/api-management/service/subscription/main.bicep similarity index 100% rename from modules/api-management/service/subscriptions/main.bicep rename to modules/api-management/service/subscription/main.bicep diff --git a/modules/api-management/service/subscriptions/main.json b/modules/api-management/service/subscription/main.json similarity index 100% rename from modules/api-management/service/subscriptions/main.json rename to modules/api-management/service/subscription/main.json diff --git a/modules/api-management/service/subscriptions/version.json b/modules/api-management/service/subscription/version.json similarity index 100% rename from modules/api-management/service/subscriptions/version.json rename to modules/api-management/service/subscription/version.json diff --git a/modules/app-configuration/configuration-stores/.bicep/nested_roleAssignments.bicep b/modules/app-configuration/configuration-store/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/app-configuration/configuration-stores/.bicep/nested_roleAssignments.bicep rename to modules/app-configuration/configuration-store/.bicep/nested_roleAssignments.bicep diff --git a/modules/app-configuration/configuration-stores/.test/common/dependencies.bicep b/modules/app-configuration/configuration-store/.test/common/dependencies.bicep similarity index 100% rename from modules/app-configuration/configuration-stores/.test/common/dependencies.bicep rename to modules/app-configuration/configuration-store/.test/common/dependencies.bicep diff --git a/modules/app-configuration/configuration-stores/.test/common/main.test.bicep b/modules/app-configuration/configuration-store/.test/common/main.test.bicep similarity index 100% rename from modules/app-configuration/configuration-stores/.test/common/main.test.bicep rename to modules/app-configuration/configuration-store/.test/common/main.test.bicep diff --git a/modules/app-configuration/configuration-stores/.test/main.test.bicep b/modules/app-configuration/configuration-store/.test/main.test.bicep similarity index 100% rename from modules/app-configuration/configuration-stores/.test/main.test.bicep rename to modules/app-configuration/configuration-store/.test/main.test.bicep diff --git a/modules/app-configuration/configuration-stores/.test/min/main.test.bicep b/modules/app-configuration/configuration-store/.test/min/main.test.bicep similarity index 100% rename from modules/app-configuration/configuration-stores/.test/min/main.test.bicep rename to modules/app-configuration/configuration-store/.test/min/main.test.bicep diff --git a/modules/app-configuration/configuration-stores/.test/pe/dependencies.bicep b/modules/app-configuration/configuration-store/.test/pe/dependencies.bicep similarity index 100% rename from modules/app-configuration/configuration-stores/.test/pe/dependencies.bicep rename to modules/app-configuration/configuration-store/.test/pe/dependencies.bicep diff --git a/modules/app-configuration/configuration-stores/.test/pe/main.test.bicep b/modules/app-configuration/configuration-store/.test/pe/main.test.bicep similarity index 100% rename from modules/app-configuration/configuration-stores/.test/pe/main.test.bicep rename to modules/app-configuration/configuration-store/.test/pe/main.test.bicep diff --git a/modules/app-configuration/configuration-stores/README.md b/modules/app-configuration/configuration-store/README.md similarity index 99% rename from modules/app-configuration/configuration-stores/README.md rename to modules/app-configuration/configuration-store/README.md index 3712e5525e..d4117967fb 100644 --- a/modules/app-configuration/configuration-stores/README.md +++ b/modules/app-configuration/configuration-store/README.md @@ -324,7 +324,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module configurationStores './app-configuration/configuration-stores/main.bicep' = { +module configurationStores './app-configuration/configuration-store/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-acccom' params: { // Required parameters @@ -477,7 +477,7 @@ module configurationStores './app-configuration/configuration-stores/main.bicep' via Bicep module ```bicep -module configurationStores './app-configuration/configuration-stores/main.bicep' = { +module configurationStores './app-configuration/configuration-store/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-accmin' params: { // Required parameters @@ -522,7 +522,7 @@ module configurationStores './app-configuration/configuration-stores/main.bicep' via Bicep module ```bicep -module configurationStores './app-configuration/configuration-stores/main.bicep' = { +module configurationStores './app-configuration/configuration-store/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-accpe' params: { // Required parameters diff --git a/modules/app-configuration/configuration-stores/key-values/.bicep/nested_roleAssignments.bicep b/modules/app-configuration/configuration-store/key-values/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/app-configuration/configuration-stores/key-values/.bicep/nested_roleAssignments.bicep rename to modules/app-configuration/configuration-store/key-values/.bicep/nested_roleAssignments.bicep diff --git a/modules/app-configuration/configuration-stores/key-values/README.md b/modules/app-configuration/configuration-store/key-values/README.md similarity index 100% rename from modules/app-configuration/configuration-stores/key-values/README.md rename to modules/app-configuration/configuration-store/key-values/README.md diff --git a/modules/app-configuration/configuration-stores/key-values/main.bicep b/modules/app-configuration/configuration-store/key-values/main.bicep similarity index 100% rename from modules/app-configuration/configuration-stores/key-values/main.bicep rename to modules/app-configuration/configuration-store/key-values/main.bicep diff --git a/modules/app-configuration/configuration-stores/key-values/main.json b/modules/app-configuration/configuration-store/key-values/main.json similarity index 100% rename from modules/app-configuration/configuration-stores/key-values/main.json rename to modules/app-configuration/configuration-store/key-values/main.json diff --git a/modules/app-configuration/configuration-stores/key-values/version.json b/modules/app-configuration/configuration-store/key-values/version.json similarity index 100% rename from modules/app-configuration/configuration-stores/key-values/version.json rename to modules/app-configuration/configuration-store/key-values/version.json diff --git a/modules/app-configuration/configuration-stores/main.bicep b/modules/app-configuration/configuration-store/main.bicep similarity index 98% rename from modules/app-configuration/configuration-stores/main.bicep rename to modules/app-configuration/configuration-store/main.bicep index 2e20570836..fe242a7844 100644 --- a/modules/app-configuration/configuration-stores/main.bicep +++ b/modules/app-configuration/configuration-store/main.bicep @@ -177,7 +177,7 @@ resource configurationStore 'Microsoft.AppConfiguration/configurationStores@2021 } } -module configurationStore_keyValues 'key-values/main.bicep' = [for (keyValue, index) in keyValues: { +module configurationStore_keyValues 'key-value/main.bicep' = [for (keyValue, index) in keyValues: { name: '${uniqueString(deployment().name, location)}-AppConfig-KeyValues-${index}' params: { appConfigurationName: configurationStore.name @@ -224,7 +224,7 @@ module configurationStore_roleAssignments '.bicep/nested_roleAssignments.bicep' } }] -module configurationStore_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module configurationStore_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-AppConfig-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/app-configuration/configuration-stores/main.json b/modules/app-configuration/configuration-store/main.json similarity index 100% rename from modules/app-configuration/configuration-stores/main.json rename to modules/app-configuration/configuration-store/main.json diff --git a/modules/app-configuration/configuration-stores/version.json b/modules/app-configuration/configuration-store/version.json similarity index 100% rename from modules/app-configuration/configuration-stores/version.json rename to modules/app-configuration/configuration-store/version.json diff --git a/modules/app/container-apps/.bicep/nested_roleAssignments.bicep b/modules/app/container-app/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/app/container-apps/.bicep/nested_roleAssignments.bicep rename to modules/app/container-app/.bicep/nested_roleAssignments.bicep diff --git a/modules/app/container-apps/.test/common/dependencies.bicep b/modules/app/container-app/.test/common/dependencies.bicep similarity index 100% rename from modules/app/container-apps/.test/common/dependencies.bicep rename to modules/app/container-app/.test/common/dependencies.bicep diff --git a/modules/app/container-apps/.test/common/main.test.bicep b/modules/app/container-app/.test/common/main.test.bicep similarity index 100% rename from modules/app/container-apps/.test/common/main.test.bicep rename to modules/app/container-app/.test/common/main.test.bicep diff --git a/modules/app/container-apps/.test/main.test.bicep b/modules/app/container-app/.test/main.test.bicep similarity index 100% rename from modules/app/container-apps/.test/main.test.bicep rename to modules/app/container-app/.test/main.test.bicep diff --git a/modules/app/container-apps/.test/min/dependencies.bicep b/modules/app/container-app/.test/min/dependencies.bicep similarity index 100% rename from modules/app/container-apps/.test/min/dependencies.bicep rename to modules/app/container-app/.test/min/dependencies.bicep diff --git a/modules/app/container-apps/.test/min/main.test.bicep b/modules/app/container-app/.test/min/main.test.bicep similarity index 100% rename from modules/app/container-apps/.test/min/main.test.bicep rename to modules/app/container-app/.test/min/main.test.bicep diff --git a/modules/app/container-apps/README.md b/modules/app/container-app/README.md similarity index 99% rename from modules/app/container-apps/README.md rename to modules/app/container-app/README.md index 3df2a1b354..66bf3e91b9 100644 --- a/modules/app/container-apps/README.md +++ b/modules/app/container-app/README.md @@ -224,7 +224,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module containerApps './app/container-apps/main.bicep' = { +module containerApps './app/container-app/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-mcappcom' params: { // Required parameters @@ -371,7 +371,7 @@ module containerApps './app/container-apps/main.bicep' = { via Bicep module ```bicep -module containerApps './app/container-apps/main.bicep' = { +module containerApps './app/container-app/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-mcappmin' params: { // Required parameters diff --git a/modules/app/container-apps/main.bicep b/modules/app/container-app/main.bicep similarity index 100% rename from modules/app/container-apps/main.bicep rename to modules/app/container-app/main.bicep diff --git a/modules/app/container-apps/main.json b/modules/app/container-app/main.json similarity index 100% rename from modules/app/container-apps/main.json rename to modules/app/container-app/main.json diff --git a/modules/app/container-apps/version.json b/modules/app/container-app/version.json similarity index 100% rename from modules/app/container-apps/version.json rename to modules/app/container-app/version.json diff --git a/modules/app/managed-environments/.bicep/nested_roleAssignments.bicep b/modules/app/managed-environment/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/app/managed-environments/.bicep/nested_roleAssignments.bicep rename to modules/app/managed-environment/.bicep/nested_roleAssignments.bicep diff --git a/modules/app/managed-environments/.test/common/dependencies.bicep b/modules/app/managed-environment/.test/common/dependencies.bicep similarity index 100% rename from modules/app/managed-environments/.test/common/dependencies.bicep rename to modules/app/managed-environment/.test/common/dependencies.bicep diff --git a/modules/app/managed-environments/.test/common/main.test.bicep b/modules/app/managed-environment/.test/common/main.test.bicep similarity index 100% rename from modules/app/managed-environments/.test/common/main.test.bicep rename to modules/app/managed-environment/.test/common/main.test.bicep diff --git a/modules/app/managed-environments/.test/main.test.bicep b/modules/app/managed-environment/.test/main.test.bicep similarity index 100% rename from modules/app/managed-environments/.test/main.test.bicep rename to modules/app/managed-environment/.test/main.test.bicep diff --git a/modules/app/managed-environments/.test/min/dependencies.bicep b/modules/app/managed-environment/.test/min/dependencies.bicep similarity index 100% rename from modules/app/managed-environments/.test/min/dependencies.bicep rename to modules/app/managed-environment/.test/min/dependencies.bicep diff --git a/modules/app/managed-environments/.test/min/main.test.bicep b/modules/app/managed-environment/.test/min/main.test.bicep similarity index 100% rename from modules/app/managed-environments/.test/min/main.test.bicep rename to modules/app/managed-environment/.test/min/main.test.bicep diff --git a/modules/app/managed-environments/README.md b/modules/app/managed-environment/README.md similarity index 98% rename from modules/app/managed-environments/README.md rename to modules/app/managed-environment/README.md index 5d54151e2a..a2e32c436a 100644 --- a/modules/app/managed-environments/README.md +++ b/modules/app/managed-environment/README.md @@ -184,7 +184,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module managedEnvironments './app/managed-environments/main.bicep' = { +module managedEnvironments './app/managed-environment/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-amecom' params: { // Required parameters @@ -273,7 +273,7 @@ module managedEnvironments './app/managed-environments/main.bicep' = { via Bicep module ```bicep -module managedEnvironments './app/managed-environments/main.bicep' = { +module managedEnvironments './app/managed-environment/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-amemin' params: { // Required parameters diff --git a/modules/app/managed-environments/main.bicep b/modules/app/managed-environment/main.bicep similarity index 100% rename from modules/app/managed-environments/main.bicep rename to modules/app/managed-environment/main.bicep diff --git a/modules/app/managed-environments/main.json b/modules/app/managed-environment/main.json similarity index 100% rename from modules/app/managed-environments/main.json rename to modules/app/managed-environment/main.json diff --git a/modules/app/managed-environments/version.json b/modules/app/managed-environment/version.json similarity index 100% rename from modules/app/managed-environments/version.json rename to modules/app/managed-environment/version.json diff --git a/modules/authorization/locks/.test/common/main.test.bicep b/modules/authorization/lock/.test/common/main.test.bicep similarity index 100% rename from modules/authorization/locks/.test/common/main.test.bicep rename to modules/authorization/lock/.test/common/main.test.bicep diff --git a/modules/authorization/locks/.test/main.test.bicep b/modules/authorization/lock/.test/main.test.bicep similarity index 100% rename from modules/authorization/locks/.test/main.test.bicep rename to modules/authorization/lock/.test/main.test.bicep diff --git a/modules/authorization/locks/README.md b/modules/authorization/lock/README.md similarity index 98% rename from modules/authorization/locks/README.md rename to modules/authorization/lock/README.md index c91fa5daa4..2091a27ca9 100644 --- a/modules/authorization/locks/README.md +++ b/modules/authorization/lock/README.md @@ -61,7 +61,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module locks './authorization/locks/main.bicep' = { +module locks './authorization/lock/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-alcom' params: { // Required parameters diff --git a/modules/authorization/locks/main.bicep b/modules/authorization/lock/main.bicep similarity index 100% rename from modules/authorization/locks/main.bicep rename to modules/authorization/lock/main.bicep diff --git a/modules/authorization/locks/main.json b/modules/authorization/lock/main.json similarity index 100% rename from modules/authorization/locks/main.json rename to modules/authorization/lock/main.json diff --git a/modules/authorization/locks/resource-group/README.md b/modules/authorization/lock/resource-group/README.md similarity index 100% rename from modules/authorization/locks/resource-group/README.md rename to modules/authorization/lock/resource-group/README.md diff --git a/modules/authorization/locks/resource-group/main.bicep b/modules/authorization/lock/resource-group/main.bicep similarity index 100% rename from modules/authorization/locks/resource-group/main.bicep rename to modules/authorization/lock/resource-group/main.bicep diff --git a/modules/authorization/locks/resource-group/main.json b/modules/authorization/lock/resource-group/main.json similarity index 100% rename from modules/authorization/locks/resource-group/main.json rename to modules/authorization/lock/resource-group/main.json diff --git a/modules/authorization/locks/resource-group/version.json b/modules/authorization/lock/resource-group/version.json similarity index 100% rename from modules/authorization/locks/resource-group/version.json rename to modules/authorization/lock/resource-group/version.json diff --git a/modules/authorization/locks/subscription/README.md b/modules/authorization/lock/subscription/README.md similarity index 100% rename from modules/authorization/locks/subscription/README.md rename to modules/authorization/lock/subscription/README.md diff --git a/modules/authorization/locks/subscription/main.bicep b/modules/authorization/lock/subscription/main.bicep similarity index 100% rename from modules/authorization/locks/subscription/main.bicep rename to modules/authorization/lock/subscription/main.bicep diff --git a/modules/authorization/locks/subscription/main.json b/modules/authorization/lock/subscription/main.json similarity index 100% rename from modules/authorization/locks/subscription/main.json rename to modules/authorization/lock/subscription/main.json diff --git a/modules/authorization/locks/subscription/version.json b/modules/authorization/lock/subscription/version.json similarity index 100% rename from modules/authorization/locks/subscription/version.json rename to modules/authorization/lock/subscription/version.json diff --git a/modules/authorization/locks/version.json b/modules/authorization/lock/version.json similarity index 100% rename from modules/authorization/locks/version.json rename to modules/authorization/lock/version.json diff --git a/modules/authorization/policy-assignments/.test/main.test.bicep b/modules/authorization/policy-assignment/.test/main.test.bicep similarity index 100% rename from modules/authorization/policy-assignments/.test/main.test.bicep rename to modules/authorization/policy-assignment/.test/main.test.bicep diff --git a/modules/authorization/policy-assignments/.test/mg.common/main.test.bicep b/modules/authorization/policy-assignment/.test/mg.common/main.test.bicep similarity index 100% rename from modules/authorization/policy-assignments/.test/mg.common/main.test.bicep rename to modules/authorization/policy-assignment/.test/mg.common/main.test.bicep diff --git a/modules/authorization/policy-assignments/.test/mg.min/main.test.bicep b/modules/authorization/policy-assignment/.test/mg.min/main.test.bicep similarity index 100% rename from modules/authorization/policy-assignments/.test/mg.min/main.test.bicep rename to modules/authorization/policy-assignment/.test/mg.min/main.test.bicep diff --git a/modules/authorization/policy-assignments/.test/rg.common/dependencies.bicep b/modules/authorization/policy-assignment/.test/rg.common/dependencies.bicep similarity index 100% rename from modules/authorization/policy-assignments/.test/rg.common/dependencies.bicep rename to modules/authorization/policy-assignment/.test/rg.common/dependencies.bicep diff --git a/modules/authorization/policy-assignments/.test/rg.common/main.test.bicep b/modules/authorization/policy-assignment/.test/rg.common/main.test.bicep similarity index 100% rename from modules/authorization/policy-assignments/.test/rg.common/main.test.bicep rename to modules/authorization/policy-assignment/.test/rg.common/main.test.bicep diff --git a/modules/authorization/policy-assignments/.test/rg.min/main.test.bicep b/modules/authorization/policy-assignment/.test/rg.min/main.test.bicep similarity index 100% rename from modules/authorization/policy-assignments/.test/rg.min/main.test.bicep rename to modules/authorization/policy-assignment/.test/rg.min/main.test.bicep diff --git a/modules/authorization/policy-assignments/.test/sub.common/dependencies.bicep b/modules/authorization/policy-assignment/.test/sub.common/dependencies.bicep similarity index 100% rename from modules/authorization/policy-assignments/.test/sub.common/dependencies.bicep rename to modules/authorization/policy-assignment/.test/sub.common/dependencies.bicep diff --git a/modules/authorization/policy-assignments/.test/sub.common/main.test.bicep b/modules/authorization/policy-assignment/.test/sub.common/main.test.bicep similarity index 100% rename from modules/authorization/policy-assignments/.test/sub.common/main.test.bicep rename to modules/authorization/policy-assignment/.test/sub.common/main.test.bicep diff --git a/modules/authorization/policy-assignments/.test/sub.min/main.test.bicep b/modules/authorization/policy-assignment/.test/sub.min/main.test.bicep similarity index 100% rename from modules/authorization/policy-assignments/.test/sub.min/main.test.bicep rename to modules/authorization/policy-assignment/.test/sub.min/main.test.bicep diff --git a/modules/authorization/policy-assignments/README.md b/modules/authorization/policy-assignment/README.md similarity index 97% rename from modules/authorization/policy-assignments/README.md rename to modules/authorization/policy-assignment/README.md index 7c03c8ca10..141d6b3f6e 100644 --- a/modules/authorization/policy-assignments/README.md +++ b/modules/authorization/policy-assignment/README.md @@ -159,7 +159,7 @@ module policyassignment 'br:bicepregistry.azurecr.io/bicep/modules/authorization ``` **Local Path Reference** ```bicep -module policyassignment 'yourpath/modules/Authorization.policyAssignments/subscription/main.bicep' = {} +module policyassignment 'yourpath/module/Authorization.policyAssignments/subscription/main.bicep' = {} ``` ## Outputs @@ -189,7 +189,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module policyAssignments './authorization/policy-assignments/main.bicep' = { +module policyAssignments './authorization/policy-assignment/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-apamgcom' params: { // Required parameters @@ -390,7 +390,7 @@ module policyAssignments './authorization/policy-assignments/main.bicep' = { via Bicep module ```bicep -module policyAssignments './authorization/policy-assignments/main.bicep' = { +module policyAssignments './authorization/policy-assignment/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apamgmin' params: { // Required parameters @@ -439,7 +439,7 @@ module policyAssignments './authorization/policy-assignments/main.bicep' = { via Bicep module ```bicep -module policyAssignments './authorization/policy-assignments/main.bicep' = { +module policyAssignments './authorization/policy-assignment/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apargcom' params: { // Required parameters @@ -648,7 +648,7 @@ module policyAssignments './authorization/policy-assignments/main.bicep' = { via Bicep module ```bicep -module policyAssignments './authorization/policy-assignments/main.bicep' = { +module policyAssignments './authorization/policy-assignment/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apargmin' params: { // Required parameters @@ -701,7 +701,7 @@ module policyAssignments './authorization/policy-assignments/main.bicep' = { via Bicep module ```bicep -module policyAssignments './authorization/policy-assignments/main.bicep' = { +module policyAssignments './authorization/policy-assignment/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apasubcom' params: { // Required parameters @@ -906,7 +906,7 @@ module policyAssignments './authorization/policy-assignments/main.bicep' = { via Bicep module ```bicep -module policyAssignments './authorization/policy-assignments/main.bicep' = { +module policyAssignments './authorization/policy-assignment/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apasubmin' params: { // Required parameters diff --git a/modules/authorization/policy-assignments/main.bicep b/modules/authorization/policy-assignment/main.bicep similarity index 100% rename from modules/authorization/policy-assignments/main.bicep rename to modules/authorization/policy-assignment/main.bicep diff --git a/modules/authorization/policy-assignments/main.json b/modules/authorization/policy-assignment/main.json similarity index 100% rename from modules/authorization/policy-assignments/main.json rename to modules/authorization/policy-assignment/main.json diff --git a/modules/authorization/policy-assignments/management-group/README.md b/modules/authorization/policy-assignment/management-group/README.md similarity index 100% rename from modules/authorization/policy-assignments/management-group/README.md rename to modules/authorization/policy-assignment/management-group/README.md diff --git a/modules/authorization/policy-assignments/management-group/main.bicep b/modules/authorization/policy-assignment/management-group/main.bicep similarity index 100% rename from modules/authorization/policy-assignments/management-group/main.bicep rename to modules/authorization/policy-assignment/management-group/main.bicep diff --git a/modules/authorization/policy-assignments/management-group/main.json b/modules/authorization/policy-assignment/management-group/main.json similarity index 100% rename from modules/authorization/policy-assignments/management-group/main.json rename to modules/authorization/policy-assignment/management-group/main.json diff --git a/modules/authorization/policy-assignments/management-group/version.json b/modules/authorization/policy-assignment/management-group/version.json similarity index 100% rename from modules/authorization/policy-assignments/management-group/version.json rename to modules/authorization/policy-assignment/management-group/version.json diff --git a/modules/authorization/policy-assignments/resource-group/README.md b/modules/authorization/policy-assignment/resource-group/README.md similarity index 100% rename from modules/authorization/policy-assignments/resource-group/README.md rename to modules/authorization/policy-assignment/resource-group/README.md diff --git a/modules/authorization/policy-assignments/resource-group/main.bicep b/modules/authorization/policy-assignment/resource-group/main.bicep similarity index 100% rename from modules/authorization/policy-assignments/resource-group/main.bicep rename to modules/authorization/policy-assignment/resource-group/main.bicep diff --git a/modules/authorization/policy-assignments/resource-group/main.json b/modules/authorization/policy-assignment/resource-group/main.json similarity index 100% rename from modules/authorization/policy-assignments/resource-group/main.json rename to modules/authorization/policy-assignment/resource-group/main.json diff --git a/modules/authorization/policy-assignments/resource-group/version.json b/modules/authorization/policy-assignment/resource-group/version.json similarity index 100% rename from modules/authorization/policy-assignments/resource-group/version.json rename to modules/authorization/policy-assignment/resource-group/version.json diff --git a/modules/authorization/policy-assignments/subscription/README.md b/modules/authorization/policy-assignment/subscription/README.md similarity index 100% rename from modules/authorization/policy-assignments/subscription/README.md rename to modules/authorization/policy-assignment/subscription/README.md diff --git a/modules/authorization/policy-assignments/subscription/main.bicep b/modules/authorization/policy-assignment/subscription/main.bicep similarity index 100% rename from modules/authorization/policy-assignments/subscription/main.bicep rename to modules/authorization/policy-assignment/subscription/main.bicep diff --git a/modules/authorization/policy-assignments/subscription/main.json b/modules/authorization/policy-assignment/subscription/main.json similarity index 100% rename from modules/authorization/policy-assignments/subscription/main.json rename to modules/authorization/policy-assignment/subscription/main.json diff --git a/modules/authorization/policy-assignments/subscription/version.json b/modules/authorization/policy-assignment/subscription/version.json similarity index 100% rename from modules/authorization/policy-assignments/subscription/version.json rename to modules/authorization/policy-assignment/subscription/version.json diff --git a/modules/authorization/policy-assignments/version.json b/modules/authorization/policy-assignment/version.json similarity index 100% rename from modules/authorization/policy-assignments/version.json rename to modules/authorization/policy-assignment/version.json diff --git a/modules/authorization/policy-definitions/.test/main.test.bicep b/modules/authorization/policy-definition/.test/main.test.bicep similarity index 100% rename from modules/authorization/policy-definitions/.test/main.test.bicep rename to modules/authorization/policy-definition/.test/main.test.bicep diff --git a/modules/authorization/policy-definitions/.test/mg.common/main.test.bicep b/modules/authorization/policy-definition/.test/mg.common/main.test.bicep similarity index 100% rename from modules/authorization/policy-definitions/.test/mg.common/main.test.bicep rename to modules/authorization/policy-definition/.test/mg.common/main.test.bicep diff --git a/modules/authorization/policy-definitions/.test/mg.min/main.test.bicep b/modules/authorization/policy-definition/.test/mg.min/main.test.bicep similarity index 100% rename from modules/authorization/policy-definitions/.test/mg.min/main.test.bicep rename to modules/authorization/policy-definition/.test/mg.min/main.test.bicep diff --git a/modules/authorization/policy-definitions/.test/sub.common/main.test.bicep b/modules/authorization/policy-definition/.test/sub.common/main.test.bicep similarity index 100% rename from modules/authorization/policy-definitions/.test/sub.common/main.test.bicep rename to modules/authorization/policy-definition/.test/sub.common/main.test.bicep diff --git a/modules/authorization/policy-definitions/.test/sub.min/main.test.bicep b/modules/authorization/policy-definition/.test/sub.min/main.test.bicep similarity index 100% rename from modules/authorization/policy-definitions/.test/sub.min/main.test.bicep rename to modules/authorization/policy-definition/.test/sub.min/main.test.bicep diff --git a/modules/authorization/policy-definitions/README.md b/modules/authorization/policy-definition/README.md similarity index 97% rename from modules/authorization/policy-definitions/README.md rename to modules/authorization/policy-definition/README.md index b116ace230..0d746c934c 100644 --- a/modules/authorization/policy-definitions/README.md +++ b/modules/authorization/policy-definition/README.md @@ -116,7 +116,7 @@ module policydefinition 'br:bicepregistry.azurecr.io/bicep/modules/authorization ``` **Local Path Reference** ```bicep -module policydefinition 'yourpath/modules/Authorization.policyDefinitions/subscription/main.bicep' = {} +module policydefinition 'yourpath/module/Authorization.policyDefinitions/subscription/main.bicep' = {} ``` ## Outputs @@ -145,7 +145,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module policyDefinitions './authorization/policy-definitions/main.bicep' = { +module policyDefinitions './authorization/policy-definition/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apdmgcom' params: { // Required parameters @@ -300,7 +300,7 @@ module policyDefinitions './authorization/policy-definitions/main.bicep' = { via Bicep module ```bicep -module policyDefinitions './authorization/policy-definitions/main.bicep' = { +module policyDefinitions './authorization/policy-definition/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apdmgmin' params: { // Required parameters @@ -393,7 +393,7 @@ module policyDefinitions './authorization/policy-definitions/main.bicep' = { via Bicep module ```bicep -module policyDefinitions './authorization/policy-definitions/main.bicep' = { +module policyDefinitions './authorization/policy-definition/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apdsubcom' params: { // Required parameters @@ -548,7 +548,7 @@ module policyDefinitions './authorization/policy-definitions/main.bicep' = { via Bicep module ```bicep -module policyDefinitions './authorization/policy-definitions/main.bicep' = { +module policyDefinitions './authorization/policy-definition/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apdsubmin' params: { // Required parameters diff --git a/modules/authorization/policy-definitions/main.bicep b/modules/authorization/policy-definition/main.bicep similarity index 100% rename from modules/authorization/policy-definitions/main.bicep rename to modules/authorization/policy-definition/main.bicep diff --git a/modules/authorization/policy-definitions/main.json b/modules/authorization/policy-definition/main.json similarity index 100% rename from modules/authorization/policy-definitions/main.json rename to modules/authorization/policy-definition/main.json diff --git a/modules/authorization/policy-definitions/management-group/README.md b/modules/authorization/policy-definition/management-group/README.md similarity index 100% rename from modules/authorization/policy-definitions/management-group/README.md rename to modules/authorization/policy-definition/management-group/README.md diff --git a/modules/authorization/policy-definitions/management-group/main.bicep b/modules/authorization/policy-definition/management-group/main.bicep similarity index 100% rename from modules/authorization/policy-definitions/management-group/main.bicep rename to modules/authorization/policy-definition/management-group/main.bicep diff --git a/modules/authorization/policy-definitions/management-group/main.json b/modules/authorization/policy-definition/management-group/main.json similarity index 100% rename from modules/authorization/policy-definitions/management-group/main.json rename to modules/authorization/policy-definition/management-group/main.json diff --git a/modules/authorization/policy-definitions/management-group/version.json b/modules/authorization/policy-definition/management-group/version.json similarity index 100% rename from modules/authorization/policy-definitions/management-group/version.json rename to modules/authorization/policy-definition/management-group/version.json diff --git a/modules/authorization/policy-definitions/subscription/README.md b/modules/authorization/policy-definition/subscription/README.md similarity index 100% rename from modules/authorization/policy-definitions/subscription/README.md rename to modules/authorization/policy-definition/subscription/README.md diff --git a/modules/authorization/policy-definitions/subscription/main.bicep b/modules/authorization/policy-definition/subscription/main.bicep similarity index 100% rename from modules/authorization/policy-definitions/subscription/main.bicep rename to modules/authorization/policy-definition/subscription/main.bicep diff --git a/modules/authorization/policy-definitions/subscription/main.json b/modules/authorization/policy-definition/subscription/main.json similarity index 100% rename from modules/authorization/policy-definitions/subscription/main.json rename to modules/authorization/policy-definition/subscription/main.json diff --git a/modules/authorization/policy-definitions/subscription/version.json b/modules/authorization/policy-definition/subscription/version.json similarity index 100% rename from modules/authorization/policy-definitions/subscription/version.json rename to modules/authorization/policy-definition/subscription/version.json diff --git a/modules/authorization/policy-definitions/version.json b/modules/authorization/policy-definition/version.json similarity index 100% rename from modules/authorization/policy-definitions/version.json rename to modules/authorization/policy-definition/version.json diff --git a/modules/authorization/policy-exemptions/.test/main.test.bicep b/modules/authorization/policy-exemption/.test/main.test.bicep similarity index 100% rename from modules/authorization/policy-exemptions/.test/main.test.bicep rename to modules/authorization/policy-exemption/.test/main.test.bicep diff --git a/modules/authorization/policy-exemptions/.test/mg.common/main.test.bicep b/modules/authorization/policy-exemption/.test/mg.common/main.test.bicep similarity index 100% rename from modules/authorization/policy-exemptions/.test/mg.common/main.test.bicep rename to modules/authorization/policy-exemption/.test/mg.common/main.test.bicep diff --git a/modules/authorization/policy-exemptions/.test/mg.min/main.test.bicep b/modules/authorization/policy-exemption/.test/mg.min/main.test.bicep similarity index 100% rename from modules/authorization/policy-exemptions/.test/mg.min/main.test.bicep rename to modules/authorization/policy-exemption/.test/mg.min/main.test.bicep diff --git a/modules/authorization/policy-exemptions/.test/rg.common/main.test.bicep b/modules/authorization/policy-exemption/.test/rg.common/main.test.bicep similarity index 100% rename from modules/authorization/policy-exemptions/.test/rg.common/main.test.bicep rename to modules/authorization/policy-exemption/.test/rg.common/main.test.bicep diff --git a/modules/authorization/policy-exemptions/.test/rg.min/main.test.bicep b/modules/authorization/policy-exemption/.test/rg.min/main.test.bicep similarity index 100% rename from modules/authorization/policy-exemptions/.test/rg.min/main.test.bicep rename to modules/authorization/policy-exemption/.test/rg.min/main.test.bicep diff --git a/modules/authorization/policy-exemptions/.test/sub.common/main.test.bicep b/modules/authorization/policy-exemption/.test/sub.common/main.test.bicep similarity index 100% rename from modules/authorization/policy-exemptions/.test/sub.common/main.test.bicep rename to modules/authorization/policy-exemption/.test/sub.common/main.test.bicep diff --git a/modules/authorization/policy-exemptions/.test/sub.min/main.test.bicep b/modules/authorization/policy-exemption/.test/sub.min/main.test.bicep similarity index 100% rename from modules/authorization/policy-exemptions/.test/sub.min/main.test.bicep rename to modules/authorization/policy-exemption/.test/sub.min/main.test.bicep diff --git a/modules/authorization/policy-exemptions/README.md b/modules/authorization/policy-exemption/README.md similarity index 96% rename from modules/authorization/policy-exemptions/README.md rename to modules/authorization/policy-exemption/README.md index dae6839631..5a1d631b7a 100644 --- a/modules/authorization/policy-exemptions/README.md +++ b/modules/authorization/policy-exemption/README.md @@ -187,7 +187,7 @@ module policyexemption 'br:bicepregistry.azurecr.io/bicep/modules/authorization. ``` **Local Path Reference** ```bicep -module policyexemption 'yourpath/modules/Authorization.policyExemptions/subscription/main.bicep' = {} +module policyexemption 'yourpath/module/Authorization.policyExemptions/subscription/main.bicep' = {} ``` ## Outputs @@ -200,7 +200,7 @@ module policyexemption 'yourpath/modules/Authorization.policyExemptions/subscrip ## Considerations -- Policy Exemptions have a dependency on Policy Assignments being applied before creating an exemption. You can use the Policy Assignment [Module](../policy-assignments/main.bicep) to deploy a Policy Assignment and then create the exemption for it on the required scope. +- Policy Exemptions have a dependency on Policy Assignments being applied before creating an exemption. You can use the Policy Assignment [Module](../policy-assignment/main.bicep) to deploy a Policy Assignment and then create the exemption for it on the required scope. ## Cross-referenced modules @@ -220,7 +220,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module policyExemptions './authorization/policy-exemptions/main.bicep' = { +module policyExemptions './authorization/policy-exemption/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apemgcom' params: { // Required parameters @@ -333,7 +333,7 @@ module policyExemptions './authorization/policy-exemptions/main.bicep' = { via Bicep module ```bicep -module policyExemptions './authorization/policy-exemptions/main.bicep' = { +module policyExemptions './authorization/policy-exemption/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apemgmin' params: { // Required parameters @@ -382,7 +382,7 @@ module policyExemptions './authorization/policy-exemptions/main.bicep' = { via Bicep module ```bicep -module policyExemptions './authorization/policy-exemptions/main.bicep' = { +module policyExemptions './authorization/policy-exemption/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apergcom' params: { // Required parameters @@ -495,7 +495,7 @@ module policyExemptions './authorization/policy-exemptions/main.bicep' = { via Bicep module ```bicep -module policyExemptions './authorization/policy-exemptions/main.bicep' = { +module policyExemptions './authorization/policy-exemption/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apergmin' params: { // Required parameters @@ -544,7 +544,7 @@ module policyExemptions './authorization/policy-exemptions/main.bicep' = { via Bicep module ```bicep -module policyExemptions './authorization/policy-exemptions/main.bicep' = { +module policyExemptions './authorization/policy-exemption/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apesubcom' params: { // Required parameters @@ -657,7 +657,7 @@ module policyExemptions './authorization/policy-exemptions/main.bicep' = { via Bicep module ```bicep -module policyExemptions './authorization/policy-exemptions/main.bicep' = { +module policyExemptions './authorization/policy-exemption/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apesubmin' params: { // Required parameters diff --git a/modules/authorization/policy-exemptions/main.bicep b/modules/authorization/policy-exemption/main.bicep similarity index 100% rename from modules/authorization/policy-exemptions/main.bicep rename to modules/authorization/policy-exemption/main.bicep diff --git a/modules/authorization/policy-exemptions/main.json b/modules/authorization/policy-exemption/main.json similarity index 100% rename from modules/authorization/policy-exemptions/main.json rename to modules/authorization/policy-exemption/main.json diff --git a/modules/authorization/policy-exemptions/management-group/README.md b/modules/authorization/policy-exemption/management-group/README.md similarity index 100% rename from modules/authorization/policy-exemptions/management-group/README.md rename to modules/authorization/policy-exemption/management-group/README.md diff --git a/modules/authorization/policy-exemptions/management-group/main.bicep b/modules/authorization/policy-exemption/management-group/main.bicep similarity index 100% rename from modules/authorization/policy-exemptions/management-group/main.bicep rename to modules/authorization/policy-exemption/management-group/main.bicep diff --git a/modules/authorization/policy-exemptions/management-group/main.json b/modules/authorization/policy-exemption/management-group/main.json similarity index 100% rename from modules/authorization/policy-exemptions/management-group/main.json rename to modules/authorization/policy-exemption/management-group/main.json diff --git a/modules/authorization/policy-exemptions/management-group/version.json b/modules/authorization/policy-exemption/management-group/version.json similarity index 100% rename from modules/authorization/policy-exemptions/management-group/version.json rename to modules/authorization/policy-exemption/management-group/version.json diff --git a/modules/authorization/policy-exemptions/resource-group/README.md b/modules/authorization/policy-exemption/resource-group/README.md similarity index 100% rename from modules/authorization/policy-exemptions/resource-group/README.md rename to modules/authorization/policy-exemption/resource-group/README.md diff --git a/modules/authorization/policy-exemptions/resource-group/main.bicep b/modules/authorization/policy-exemption/resource-group/main.bicep similarity index 100% rename from modules/authorization/policy-exemptions/resource-group/main.bicep rename to modules/authorization/policy-exemption/resource-group/main.bicep diff --git a/modules/authorization/policy-exemptions/resource-group/main.json b/modules/authorization/policy-exemption/resource-group/main.json similarity index 100% rename from modules/authorization/policy-exemptions/resource-group/main.json rename to modules/authorization/policy-exemption/resource-group/main.json diff --git a/modules/authorization/policy-exemptions/resource-group/version.json b/modules/authorization/policy-exemption/resource-group/version.json similarity index 100% rename from modules/authorization/policy-exemptions/resource-group/version.json rename to modules/authorization/policy-exemption/resource-group/version.json diff --git a/modules/authorization/policy-exemptions/subscription/README.md b/modules/authorization/policy-exemption/subscription/README.md similarity index 100% rename from modules/authorization/policy-exemptions/subscription/README.md rename to modules/authorization/policy-exemption/subscription/README.md diff --git a/modules/authorization/policy-exemptions/subscription/main.bicep b/modules/authorization/policy-exemption/subscription/main.bicep similarity index 100% rename from modules/authorization/policy-exemptions/subscription/main.bicep rename to modules/authorization/policy-exemption/subscription/main.bicep diff --git a/modules/authorization/policy-exemptions/subscription/main.json b/modules/authorization/policy-exemption/subscription/main.json similarity index 100% rename from modules/authorization/policy-exemptions/subscription/main.json rename to modules/authorization/policy-exemption/subscription/main.json diff --git a/modules/authorization/policy-exemptions/subscription/version.json b/modules/authorization/policy-exemption/subscription/version.json similarity index 100% rename from modules/authorization/policy-exemptions/subscription/version.json rename to modules/authorization/policy-exemption/subscription/version.json diff --git a/modules/authorization/policy-exemptions/version.json b/modules/authorization/policy-exemption/version.json similarity index 100% rename from modules/authorization/policy-exemptions/version.json rename to modules/authorization/policy-exemption/version.json diff --git a/modules/authorization/policy-set-definitions/.test/main.test.bicep b/modules/authorization/policy-set-definition/.test/main.test.bicep similarity index 100% rename from modules/authorization/policy-set-definitions/.test/main.test.bicep rename to modules/authorization/policy-set-definition/.test/main.test.bicep diff --git a/modules/authorization/policy-set-definitions/.test/mg.common/main.test.bicep b/modules/authorization/policy-set-definition/.test/mg.common/main.test.bicep similarity index 100% rename from modules/authorization/policy-set-definitions/.test/mg.common/main.test.bicep rename to modules/authorization/policy-set-definition/.test/mg.common/main.test.bicep diff --git a/modules/authorization/policy-set-definitions/.test/mg.min/main.test.bicep b/modules/authorization/policy-set-definition/.test/mg.min/main.test.bicep similarity index 100% rename from modules/authorization/policy-set-definitions/.test/mg.min/main.test.bicep rename to modules/authorization/policy-set-definition/.test/mg.min/main.test.bicep diff --git a/modules/authorization/policy-set-definitions/.test/sub.common/main.test.bicep b/modules/authorization/policy-set-definition/.test/sub.common/main.test.bicep similarity index 100% rename from modules/authorization/policy-set-definitions/.test/sub.common/main.test.bicep rename to modules/authorization/policy-set-definition/.test/sub.common/main.test.bicep diff --git a/modules/authorization/policy-set-definitions/.test/sub.min/main.test.bicep b/modules/authorization/policy-set-definition/.test/sub.min/main.test.bicep similarity index 100% rename from modules/authorization/policy-set-definitions/.test/sub.min/main.test.bicep rename to modules/authorization/policy-set-definition/.test/sub.min/main.test.bicep diff --git a/modules/authorization/policy-set-definitions/README.md b/modules/authorization/policy-set-definition/README.md similarity index 97% rename from modules/authorization/policy-set-definitions/README.md rename to modules/authorization/policy-set-definition/README.md index de574428a9..f190d9a415 100644 --- a/modules/authorization/policy-set-definitions/README.md +++ b/modules/authorization/policy-set-definition/README.md @@ -119,7 +119,7 @@ module policysetdefinition 'br:bicepregistry.azurecr.io/bicep/modules/authorizat ``` **Local Path Reference** ```bicep -module policysetdefinition 'yourpath/modules/Authorization.policySetDefinitions/subscription/main.bicep' = {} +module policysetdefinition 'yourpath/module/Authorization.policySetDefinitions/subscription/main.bicep' = {} ``` ## Outputs @@ -131,7 +131,7 @@ module policysetdefinition 'yourpath/modules/Authorization.policySetDefinitions/ ## Considerations -- Policy Set Definitions (Initiatives) have a dependency on Policy Assignments being applied before creating an initiative. You can use the Policy Assignment [Module](../policy-definitions/main.bicep) to deploy a Policy Definition and then create an initiative for it on the required scope. +- Policy Set Definitions (Initiatives) have a dependency on Policy Assignments being applied before creating an initiative. You can use the Policy Assignment [Module](../policy-definition/main.bicep) to deploy a Policy Definition and then create an initiative for it on the required scope. ## Cross-referenced modules @@ -151,7 +151,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module policySetDefinitions './authorization/policy-set-definitions/main.bicep' = { +module policySetDefinitions './authorization/policy-set-definition/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apsdmgcom' params: { // Required parameters @@ -294,7 +294,7 @@ module policySetDefinitions './authorization/policy-set-definitions/main.bicep' via Bicep module ```bicep -module policySetDefinitions './authorization/policy-set-definitions/main.bicep' = { +module policySetDefinitions './authorization/policy-set-definition/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apsdmgmin' params: { // Required parameters @@ -365,7 +365,7 @@ module policySetDefinitions './authorization/policy-set-definitions/main.bicep' via Bicep module ```bicep -module policySetDefinitions './authorization/policy-set-definitions/main.bicep' = { +module policySetDefinitions './authorization/policy-set-definition/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apsdsubcom' params: { // Required parameters @@ -508,7 +508,7 @@ module policySetDefinitions './authorization/policy-set-definitions/main.bicep' via Bicep module ```bicep -module policySetDefinitions './authorization/policy-set-definitions/main.bicep' = { +module policySetDefinitions './authorization/policy-set-definition/main.bicep' = { name: '${uniqueString(deployment().name)}-test-apsdsubmin' params: { // Required parameters diff --git a/modules/authorization/policy-set-definitions/main.bicep b/modules/authorization/policy-set-definition/main.bicep similarity index 100% rename from modules/authorization/policy-set-definitions/main.bicep rename to modules/authorization/policy-set-definition/main.bicep diff --git a/modules/authorization/policy-set-definitions/main.json b/modules/authorization/policy-set-definition/main.json similarity index 100% rename from modules/authorization/policy-set-definitions/main.json rename to modules/authorization/policy-set-definition/main.json diff --git a/modules/authorization/policy-set-definitions/management-group/README.md b/modules/authorization/policy-set-definition/management-group/README.md similarity index 100% rename from modules/authorization/policy-set-definitions/management-group/README.md rename to modules/authorization/policy-set-definition/management-group/README.md diff --git a/modules/authorization/policy-set-definitions/management-group/main.bicep b/modules/authorization/policy-set-definition/management-group/main.bicep similarity index 100% rename from modules/authorization/policy-set-definitions/management-group/main.bicep rename to modules/authorization/policy-set-definition/management-group/main.bicep diff --git a/modules/authorization/policy-set-definitions/management-group/main.json b/modules/authorization/policy-set-definition/management-group/main.json similarity index 100% rename from modules/authorization/policy-set-definitions/management-group/main.json rename to modules/authorization/policy-set-definition/management-group/main.json diff --git a/modules/authorization/policy-set-definitions/management-group/version.json b/modules/authorization/policy-set-definition/management-group/version.json similarity index 100% rename from modules/authorization/policy-set-definitions/management-group/version.json rename to modules/authorization/policy-set-definition/management-group/version.json diff --git a/modules/authorization/policy-set-definitions/subscription/README.md b/modules/authorization/policy-set-definition/subscription/README.md similarity index 100% rename from modules/authorization/policy-set-definitions/subscription/README.md rename to modules/authorization/policy-set-definition/subscription/README.md diff --git a/modules/authorization/policy-set-definitions/subscription/main.bicep b/modules/authorization/policy-set-definition/subscription/main.bicep similarity index 100% rename from modules/authorization/policy-set-definitions/subscription/main.bicep rename to modules/authorization/policy-set-definition/subscription/main.bicep diff --git a/modules/authorization/policy-set-definitions/subscription/main.json b/modules/authorization/policy-set-definition/subscription/main.json similarity index 100% rename from modules/authorization/policy-set-definitions/subscription/main.json rename to modules/authorization/policy-set-definition/subscription/main.json diff --git a/modules/authorization/policy-set-definitions/subscription/version.json b/modules/authorization/policy-set-definition/subscription/version.json similarity index 100% rename from modules/authorization/policy-set-definitions/subscription/version.json rename to modules/authorization/policy-set-definition/subscription/version.json diff --git a/modules/authorization/policy-set-definitions/version.json b/modules/authorization/policy-set-definition/version.json similarity index 100% rename from modules/authorization/policy-set-definitions/version.json rename to modules/authorization/policy-set-definition/version.json diff --git a/modules/authorization/role-assignments/.test/main.test.bicep b/modules/authorization/role-assignment/.test/main.test.bicep similarity index 100% rename from modules/authorization/role-assignments/.test/main.test.bicep rename to modules/authorization/role-assignment/.test/main.test.bicep diff --git a/modules/authorization/role-assignments/.test/mg.common/dependencies.bicep b/modules/authorization/role-assignment/.test/mg.common/dependencies.bicep similarity index 100% rename from modules/authorization/role-assignments/.test/mg.common/dependencies.bicep rename to modules/authorization/role-assignment/.test/mg.common/dependencies.bicep diff --git a/modules/authorization/role-assignments/.test/mg.common/interim.dependencies.bicep b/modules/authorization/role-assignment/.test/mg.common/interim.dependencies.bicep similarity index 100% rename from modules/authorization/role-assignments/.test/mg.common/interim.dependencies.bicep rename to modules/authorization/role-assignment/.test/mg.common/interim.dependencies.bicep diff --git a/modules/authorization/role-assignments/.test/mg.common/main.test.bicep b/modules/authorization/role-assignment/.test/mg.common/main.test.bicep similarity index 100% rename from modules/authorization/role-assignments/.test/mg.common/main.test.bicep rename to modules/authorization/role-assignment/.test/mg.common/main.test.bicep diff --git a/modules/authorization/role-assignments/.test/mg.min/dependencies.bicep b/modules/authorization/role-assignment/.test/mg.min/dependencies.bicep similarity index 100% rename from modules/authorization/role-assignments/.test/mg.min/dependencies.bicep rename to modules/authorization/role-assignment/.test/mg.min/dependencies.bicep diff --git a/modules/authorization/role-assignments/.test/mg.min/interim.dependencies.bicep b/modules/authorization/role-assignment/.test/mg.min/interim.dependencies.bicep similarity index 100% rename from modules/authorization/role-assignments/.test/mg.min/interim.dependencies.bicep rename to modules/authorization/role-assignment/.test/mg.min/interim.dependencies.bicep diff --git a/modules/authorization/role-assignments/.test/mg.min/main.test.bicep b/modules/authorization/role-assignment/.test/mg.min/main.test.bicep similarity index 100% rename from modules/authorization/role-assignments/.test/mg.min/main.test.bicep rename to modules/authorization/role-assignment/.test/mg.min/main.test.bicep diff --git a/modules/authorization/role-assignments/.test/rg.common/dependencies.bicep b/modules/authorization/role-assignment/.test/rg.common/dependencies.bicep similarity index 100% rename from modules/authorization/role-assignments/.test/rg.common/dependencies.bicep rename to modules/authorization/role-assignment/.test/rg.common/dependencies.bicep diff --git a/modules/authorization/role-assignments/.test/rg.common/main.test.bicep b/modules/authorization/role-assignment/.test/rg.common/main.test.bicep similarity index 100% rename from modules/authorization/role-assignments/.test/rg.common/main.test.bicep rename to modules/authorization/role-assignment/.test/rg.common/main.test.bicep diff --git a/modules/authorization/role-assignments/.test/rg.min/dependencies.bicep b/modules/authorization/role-assignment/.test/rg.min/dependencies.bicep similarity index 100% rename from modules/authorization/role-assignments/.test/rg.min/dependencies.bicep rename to modules/authorization/role-assignment/.test/rg.min/dependencies.bicep diff --git a/modules/authorization/role-assignments/.test/rg.min/main.test.bicep b/modules/authorization/role-assignment/.test/rg.min/main.test.bicep similarity index 100% rename from modules/authorization/role-assignments/.test/rg.min/main.test.bicep rename to modules/authorization/role-assignment/.test/rg.min/main.test.bicep diff --git a/modules/authorization/role-assignments/.test/sub.common/dependencies.bicep b/modules/authorization/role-assignment/.test/sub.common/dependencies.bicep similarity index 100% rename from modules/authorization/role-assignments/.test/sub.common/dependencies.bicep rename to modules/authorization/role-assignment/.test/sub.common/dependencies.bicep diff --git a/modules/authorization/role-assignments/.test/sub.common/main.test.bicep b/modules/authorization/role-assignment/.test/sub.common/main.test.bicep similarity index 100% rename from modules/authorization/role-assignments/.test/sub.common/main.test.bicep rename to modules/authorization/role-assignment/.test/sub.common/main.test.bicep diff --git a/modules/authorization/role-assignments/.test/sub.min/dependencies.bicep b/modules/authorization/role-assignment/.test/sub.min/dependencies.bicep similarity index 100% rename from modules/authorization/role-assignments/.test/sub.min/dependencies.bicep rename to modules/authorization/role-assignment/.test/sub.min/dependencies.bicep diff --git a/modules/authorization/role-assignments/.test/sub.min/main.test.bicep b/modules/authorization/role-assignment/.test/sub.min/main.test.bicep similarity index 100% rename from modules/authorization/role-assignments/.test/sub.min/main.test.bicep rename to modules/authorization/role-assignment/.test/sub.min/main.test.bicep diff --git a/modules/authorization/role-assignments/README.md b/modules/authorization/role-assignment/README.md similarity index 96% rename from modules/authorization/role-assignments/README.md rename to modules/authorization/role-assignment/README.md index c02a7f6587..df61fb4545 100644 --- a/modules/authorization/role-assignments/README.md +++ b/modules/authorization/role-assignment/README.md @@ -153,7 +153,7 @@ module roleassignment 'br:bicepregistry.azurecr.io/bicep/modules/authorization.r ``` **Local Path Reference** ```bicep -module roleassignment 'yourpath/modules/Authorization.roleAssignments/subscription/main.bicep' = {} +module roleassignment 'yourpath/module/Authorization.roleAssignments/subscription/main.bicep' = {} ``` ## Outputs @@ -186,7 +186,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module roleAssignments './authorization/role-assignments/main.bicep' = { +module roleAssignments './authorization/role-assignment/main.bicep' = { name: '${uniqueString(deployment().name)}-test-aramgcom' params: { // Required parameters @@ -247,7 +247,7 @@ module roleAssignments './authorization/role-assignments/main.bicep' = { via Bicep module ```bicep -module roleAssignments './authorization/role-assignments/main.bicep' = { +module roleAssignments './authorization/role-assignment/main.bicep' = { name: '${uniqueString(deployment().name)}-test-aramgmin' params: { // Required parameters @@ -300,7 +300,7 @@ module roleAssignments './authorization/role-assignments/main.bicep' = { via Bicep module ```bicep -module roleAssignments './authorization/role-assignments/main.bicep' = { +module roleAssignments './authorization/role-assignment/main.bicep' = { name: '${uniqueString(deployment().name)}-test-arargcom' params: { // Required parameters @@ -365,7 +365,7 @@ module roleAssignments './authorization/role-assignments/main.bicep' = { via Bicep module ```bicep -module roleAssignments './authorization/role-assignments/main.bicep' = { +module roleAssignments './authorization/role-assignment/main.bicep' = { name: '${uniqueString(deployment().name)}-test-arargmin' params: { // Required parameters @@ -426,7 +426,7 @@ module roleAssignments './authorization/role-assignments/main.bicep' = { via Bicep module ```bicep -module roleAssignments './authorization/role-assignments/main.bicep' = { +module roleAssignments './authorization/role-assignment/main.bicep' = { name: '${uniqueString(deployment().name)}-test-arasubcom' params: { // Required parameters @@ -487,7 +487,7 @@ module roleAssignments './authorization/role-assignments/main.bicep' = { via Bicep module ```bicep -module roleAssignments './authorization/role-assignments/main.bicep' = { +module roleAssignments './authorization/role-assignment/main.bicep' = { name: '${uniqueString(deployment().name)}-test-arasubmin' params: { // Required parameters diff --git a/modules/authorization/role-assignments/main.bicep b/modules/authorization/role-assignment/main.bicep similarity index 100% rename from modules/authorization/role-assignments/main.bicep rename to modules/authorization/role-assignment/main.bicep diff --git a/modules/authorization/role-assignments/main.json b/modules/authorization/role-assignment/main.json similarity index 100% rename from modules/authorization/role-assignments/main.json rename to modules/authorization/role-assignment/main.json diff --git a/modules/authorization/role-assignments/management-group/README.md b/modules/authorization/role-assignment/management-group/README.md similarity index 100% rename from modules/authorization/role-assignments/management-group/README.md rename to modules/authorization/role-assignment/management-group/README.md diff --git a/modules/authorization/role-assignments/management-group/main.bicep b/modules/authorization/role-assignment/management-group/main.bicep similarity index 100% rename from modules/authorization/role-assignments/management-group/main.bicep rename to modules/authorization/role-assignment/management-group/main.bicep diff --git a/modules/authorization/role-assignments/management-group/main.json b/modules/authorization/role-assignment/management-group/main.json similarity index 100% rename from modules/authorization/role-assignments/management-group/main.json rename to modules/authorization/role-assignment/management-group/main.json diff --git a/modules/authorization/role-assignments/management-group/version.json b/modules/authorization/role-assignment/management-group/version.json similarity index 100% rename from modules/authorization/role-assignments/management-group/version.json rename to modules/authorization/role-assignment/management-group/version.json diff --git a/modules/authorization/role-assignments/resource-group/README.md b/modules/authorization/role-assignment/resource-group/README.md similarity index 100% rename from modules/authorization/role-assignments/resource-group/README.md rename to modules/authorization/role-assignment/resource-group/README.md diff --git a/modules/authorization/role-assignments/resource-group/main.bicep b/modules/authorization/role-assignment/resource-group/main.bicep similarity index 100% rename from modules/authorization/role-assignments/resource-group/main.bicep rename to modules/authorization/role-assignment/resource-group/main.bicep diff --git a/modules/authorization/role-assignments/resource-group/main.json b/modules/authorization/role-assignment/resource-group/main.json similarity index 100% rename from modules/authorization/role-assignments/resource-group/main.json rename to modules/authorization/role-assignment/resource-group/main.json diff --git a/modules/authorization/role-assignments/resource-group/version.json b/modules/authorization/role-assignment/resource-group/version.json similarity index 100% rename from modules/authorization/role-assignments/resource-group/version.json rename to modules/authorization/role-assignment/resource-group/version.json diff --git a/modules/authorization/role-assignments/subscription/README.md b/modules/authorization/role-assignment/subscription/README.md similarity index 100% rename from modules/authorization/role-assignments/subscription/README.md rename to modules/authorization/role-assignment/subscription/README.md diff --git a/modules/authorization/role-assignments/subscription/main.bicep b/modules/authorization/role-assignment/subscription/main.bicep similarity index 100% rename from modules/authorization/role-assignments/subscription/main.bicep rename to modules/authorization/role-assignment/subscription/main.bicep diff --git a/modules/authorization/role-assignments/subscription/main.json b/modules/authorization/role-assignment/subscription/main.json similarity index 100% rename from modules/authorization/role-assignments/subscription/main.json rename to modules/authorization/role-assignment/subscription/main.json diff --git a/modules/authorization/role-assignments/subscription/version.json b/modules/authorization/role-assignment/subscription/version.json similarity index 100% rename from modules/authorization/role-assignments/subscription/version.json rename to modules/authorization/role-assignment/subscription/version.json diff --git a/modules/authorization/role-assignments/version.json b/modules/authorization/role-assignment/version.json similarity index 100% rename from modules/authorization/role-assignments/version.json rename to modules/authorization/role-assignment/version.json diff --git a/modules/authorization/role-definitions/.test/main.test.bicep b/modules/authorization/role-definition/.test/main.test.bicep similarity index 100% rename from modules/authorization/role-definitions/.test/main.test.bicep rename to modules/authorization/role-definition/.test/main.test.bicep diff --git a/modules/authorization/role-definitions/.test/mg.common/main.test.bicep b/modules/authorization/role-definition/.test/mg.common/main.test.bicep similarity index 100% rename from modules/authorization/role-definitions/.test/mg.common/main.test.bicep rename to modules/authorization/role-definition/.test/mg.common/main.test.bicep diff --git a/modules/authorization/role-definitions/.test/mg.min/main.test.bicep b/modules/authorization/role-definition/.test/mg.min/main.test.bicep similarity index 100% rename from modules/authorization/role-definitions/.test/mg.min/main.test.bicep rename to modules/authorization/role-definition/.test/mg.min/main.test.bicep diff --git a/modules/authorization/role-definitions/.test/rg.common/main.test.bicep b/modules/authorization/role-definition/.test/rg.common/main.test.bicep similarity index 100% rename from modules/authorization/role-definitions/.test/rg.common/main.test.bicep rename to modules/authorization/role-definition/.test/rg.common/main.test.bicep diff --git a/modules/authorization/role-definitions/.test/rg.min/main.test.bicep b/modules/authorization/role-definition/.test/rg.min/main.test.bicep similarity index 100% rename from modules/authorization/role-definitions/.test/rg.min/main.test.bicep rename to modules/authorization/role-definition/.test/rg.min/main.test.bicep diff --git a/modules/authorization/role-definitions/.test/sub.common/main.test.bicep b/modules/authorization/role-definition/.test/sub.common/main.test.bicep similarity index 100% rename from modules/authorization/role-definitions/.test/sub.common/main.test.bicep rename to modules/authorization/role-definition/.test/sub.common/main.test.bicep diff --git a/modules/authorization/role-definitions/.test/sub.min/main.test.bicep b/modules/authorization/role-definition/.test/sub.min/main.test.bicep similarity index 100% rename from modules/authorization/role-definitions/.test/sub.min/main.test.bicep rename to modules/authorization/role-definition/.test/sub.min/main.test.bicep diff --git a/modules/authorization/role-definitions/README.md b/modules/authorization/role-definition/README.md similarity index 96% rename from modules/authorization/role-definitions/README.md rename to modules/authorization/role-definition/README.md index 5831eb1e61..6502d42653 100644 --- a/modules/authorization/role-definitions/README.md +++ b/modules/authorization/role-definition/README.md @@ -153,7 +153,7 @@ module roledefinition 'br:bicepregistry.azurecr.io/bicep/modules/authorization.r ``` **Local Path Reference** ```bicep -module roledefinition 'yourpath/modules/Authorization.roleDefinitions/subscription/main.bicep' = {} +module roledefinition 'yourpath/module/Authorization.roleDefinitions/subscription/main.bicep' = {} ``` ## Outputs @@ -190,7 +190,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module roleDefinitions './authorization/role-definitions/main.bicep' = { +module roleDefinitions './authorization/role-definition/main.bicep' = { name: '${uniqueString(deployment().name)}-test-ardmgcom' params: { // Required parameters @@ -269,7 +269,7 @@ module roleDefinitions './authorization/role-definitions/main.bicep' = { via Bicep module ```bicep -module roleDefinitions './authorization/role-definitions/main.bicep' = { +module roleDefinitions './authorization/role-definition/main.bicep' = { name: '${uniqueString(deployment().name)}-test-ardmgmin' params: { // Required parameters @@ -324,7 +324,7 @@ module roleDefinitions './authorization/role-definitions/main.bicep' = { via Bicep module ```bicep -module roleDefinitions './authorization/role-definitions/main.bicep' = { +module roleDefinitions './authorization/role-definition/main.bicep' = { name: '${uniqueString(deployment().name)}-test-ardrgcom' params: { // Required parameters @@ -419,7 +419,7 @@ module roleDefinitions './authorization/role-definitions/main.bicep' = { via Bicep module ```bicep -module roleDefinitions './authorization/role-definitions/main.bicep' = { +module roleDefinitions './authorization/role-definition/main.bicep' = { name: '${uniqueString(deployment().name)}-test-ardrgmin' params: { // Required parameters @@ -474,7 +474,7 @@ module roleDefinitions './authorization/role-definitions/main.bicep' = { via Bicep module ```bicep -module roleDefinitions './authorization/role-definitions/main.bicep' = { +module roleDefinitions './authorization/role-definition/main.bicep' = { name: '${uniqueString(deployment().name)}-test-ardsubcom' params: { // Required parameters @@ -569,7 +569,7 @@ module roleDefinitions './authorization/role-definitions/main.bicep' = { via Bicep module ```bicep -module roleDefinitions './authorization/role-definitions/main.bicep' = { +module roleDefinitions './authorization/role-definition/main.bicep' = { name: '${uniqueString(deployment().name)}-test-ardsubmin' params: { // Required parameters diff --git a/modules/authorization/role-definitions/main.bicep b/modules/authorization/role-definition/main.bicep similarity index 100% rename from modules/authorization/role-definitions/main.bicep rename to modules/authorization/role-definition/main.bicep diff --git a/modules/authorization/role-definitions/main.json b/modules/authorization/role-definition/main.json similarity index 100% rename from modules/authorization/role-definitions/main.json rename to modules/authorization/role-definition/main.json diff --git a/modules/authorization/role-definitions/management-group/README.md b/modules/authorization/role-definition/management-group/README.md similarity index 100% rename from modules/authorization/role-definitions/management-group/README.md rename to modules/authorization/role-definition/management-group/README.md diff --git a/modules/authorization/role-definitions/management-group/main.bicep b/modules/authorization/role-definition/management-group/main.bicep similarity index 100% rename from modules/authorization/role-definitions/management-group/main.bicep rename to modules/authorization/role-definition/management-group/main.bicep diff --git a/modules/authorization/role-definitions/management-group/main.json b/modules/authorization/role-definition/management-group/main.json similarity index 100% rename from modules/authorization/role-definitions/management-group/main.json rename to modules/authorization/role-definition/management-group/main.json diff --git a/modules/authorization/role-definitions/management-group/version.json b/modules/authorization/role-definition/management-group/version.json similarity index 100% rename from modules/authorization/role-definitions/management-group/version.json rename to modules/authorization/role-definition/management-group/version.json diff --git a/modules/authorization/role-definitions/resource-group/README.md b/modules/authorization/role-definition/resource-group/README.md similarity index 100% rename from modules/authorization/role-definitions/resource-group/README.md rename to modules/authorization/role-definition/resource-group/README.md diff --git a/modules/authorization/role-definitions/resource-group/main.bicep b/modules/authorization/role-definition/resource-group/main.bicep similarity index 100% rename from modules/authorization/role-definitions/resource-group/main.bicep rename to modules/authorization/role-definition/resource-group/main.bicep diff --git a/modules/authorization/role-definitions/resource-group/main.json b/modules/authorization/role-definition/resource-group/main.json similarity index 100% rename from modules/authorization/role-definitions/resource-group/main.json rename to modules/authorization/role-definition/resource-group/main.json diff --git a/modules/authorization/role-definitions/resource-group/version.json b/modules/authorization/role-definition/resource-group/version.json similarity index 100% rename from modules/authorization/role-definitions/resource-group/version.json rename to modules/authorization/role-definition/resource-group/version.json diff --git a/modules/authorization/role-definitions/subscription/README.md b/modules/authorization/role-definition/subscription/README.md similarity index 100% rename from modules/authorization/role-definitions/subscription/README.md rename to modules/authorization/role-definition/subscription/README.md diff --git a/modules/authorization/role-definitions/subscription/main.bicep b/modules/authorization/role-definition/subscription/main.bicep similarity index 100% rename from modules/authorization/role-definitions/subscription/main.bicep rename to modules/authorization/role-definition/subscription/main.bicep diff --git a/modules/authorization/role-definitions/subscription/main.json b/modules/authorization/role-definition/subscription/main.json similarity index 100% rename from modules/authorization/role-definitions/subscription/main.json rename to modules/authorization/role-definition/subscription/main.json diff --git a/modules/authorization/role-definitions/subscription/version.json b/modules/authorization/role-definition/subscription/version.json similarity index 100% rename from modules/authorization/role-definitions/subscription/version.json rename to modules/authorization/role-definition/subscription/version.json diff --git a/modules/authorization/role-definitions/version.json b/modules/authorization/role-definition/version.json similarity index 100% rename from modules/authorization/role-definitions/version.json rename to modules/authorization/role-definition/version.json diff --git a/modules/automation/automation-accounts/.bicep/nested_roleAssignments.bicep b/modules/automation/automation-account/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/automation/automation-accounts/.bicep/nested_roleAssignments.bicep rename to modules/automation/automation-account/.bicep/nested_roleAssignments.bicep diff --git a/modules/automation/automation-accounts/.test/common/dependencies.bicep b/modules/automation/automation-account/.test/common/dependencies.bicep similarity index 100% rename from modules/automation/automation-accounts/.test/common/dependencies.bicep rename to modules/automation/automation-account/.test/common/dependencies.bicep diff --git a/modules/automation/automation-accounts/.test/common/main.test.bicep b/modules/automation/automation-account/.test/common/main.test.bicep similarity index 100% rename from modules/automation/automation-accounts/.test/common/main.test.bicep rename to modules/automation/automation-account/.test/common/main.test.bicep diff --git a/modules/automation/automation-accounts/.test/encr/dependencies.bicep b/modules/automation/automation-account/.test/encr/dependencies.bicep similarity index 100% rename from modules/automation/automation-accounts/.test/encr/dependencies.bicep rename to modules/automation/automation-account/.test/encr/dependencies.bicep diff --git a/modules/automation/automation-accounts/.test/encr/main.test.bicep b/modules/automation/automation-account/.test/encr/main.test.bicep similarity index 100% rename from modules/automation/automation-accounts/.test/encr/main.test.bicep rename to modules/automation/automation-account/.test/encr/main.test.bicep diff --git a/modules/automation/automation-accounts/.test/main.test.bicep b/modules/automation/automation-account/.test/main.test.bicep similarity index 100% rename from modules/automation/automation-accounts/.test/main.test.bicep rename to modules/automation/automation-account/.test/main.test.bicep diff --git a/modules/automation/automation-accounts/.test/min/main.test.bicep b/modules/automation/automation-account/.test/min/main.test.bicep similarity index 100% rename from modules/automation/automation-accounts/.test/min/main.test.bicep rename to modules/automation/automation-account/.test/min/main.test.bicep diff --git a/modules/automation/automation-accounts/README.md b/modules/automation/automation-account/README.md similarity index 99% rename from modules/automation/automation-accounts/README.md rename to modules/automation/automation-account/README.md index 3ae9889f3b..7679adfcc1 100644 --- a/modules/automation/automation-accounts/README.md +++ b/modules/automation/automation-account/README.md @@ -401,7 +401,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module automationAccounts './automation/automation-accounts/main.bicep' = { +module automationAccounts './automation/automation-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-aacom' params: { // Required parameters @@ -842,7 +842,7 @@ module automationAccounts './automation/automation-accounts/main.bicep' = { via Bicep module ```bicep -module automationAccounts './automation/automation-accounts/main.bicep' = { +module automationAccounts './automation/automation-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-aaencr' params: { // Required parameters @@ -907,7 +907,7 @@ module automationAccounts './automation/automation-accounts/main.bicep' = { via Bicep module ```bicep -module automationAccounts './automation/automation-accounts/main.bicep' = { +module automationAccounts './automation/automation-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-aamin' params: { // Required parameters diff --git a/modules/automation/automation-accounts/job-schedules/README.md b/modules/automation/automation-account/job-schedules/README.md similarity index 100% rename from modules/automation/automation-accounts/job-schedules/README.md rename to modules/automation/automation-account/job-schedules/README.md diff --git a/modules/automation/automation-accounts/job-schedules/main.bicep b/modules/automation/automation-account/job-schedules/main.bicep similarity index 100% rename from modules/automation/automation-accounts/job-schedules/main.bicep rename to modules/automation/automation-account/job-schedules/main.bicep diff --git a/modules/automation/automation-accounts/job-schedules/main.json b/modules/automation/automation-account/job-schedules/main.json similarity index 100% rename from modules/automation/automation-accounts/job-schedules/main.json rename to modules/automation/automation-account/job-schedules/main.json diff --git a/modules/automation/automation-accounts/job-schedules/version.json b/modules/automation/automation-account/job-schedules/version.json similarity index 100% rename from modules/automation/automation-accounts/job-schedules/version.json rename to modules/automation/automation-account/job-schedules/version.json diff --git a/modules/automation/automation-accounts/main.bicep b/modules/automation/automation-account/main.bicep similarity index 95% rename from modules/automation/automation-accounts/main.bicep rename to modules/automation/automation-account/main.bicep index 77d8e760ea..b94b53b0d4 100644 --- a/modules/automation/automation-accounts/main.bicep +++ b/modules/automation/automation-account/main.bicep @@ -214,7 +214,7 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2022-08-08' } } -module automationAccount_modules 'modules/main.bicep' = [for (module, index) in modules: { +module automationAccount_modules 'module/main.bicep' = [for (module, index) in modules: { name: '${uniqueString(deployment().name, location)}-AutoAccount-Module-${index}' params: { name: module.name @@ -227,7 +227,7 @@ module automationAccount_modules 'modules/main.bicep' = [for (module, index) in } }] -module automationAccount_schedules 'schedules/main.bicep' = [for (schedule, index) in schedules: { +module automationAccount_schedules 'schedule/main.bicep' = [for (schedule, index) in schedules: { name: '${uniqueString(deployment().name, location)}-AutoAccount-Schedule-${index}' params: { name: schedule.name @@ -243,7 +243,7 @@ module automationAccount_schedules 'schedules/main.bicep' = [for (schedule, inde } }] -module automationAccount_runbooks 'runbooks/main.bicep' = [for (runbook, index) in runbooks: { +module automationAccount_runbooks 'runbook/main.bicep' = [for (runbook, index) in runbooks: { name: '${uniqueString(deployment().name, location)}-AutoAccount-Runbook-${index}' params: { name: runbook.name @@ -258,7 +258,7 @@ module automationAccount_runbooks 'runbooks/main.bicep' = [for (runbook, index) } }] -module automationAccount_jobSchedules 'job-schedules/main.bicep' = [for (jobSchedule, index) in jobSchedules: { +module automationAccount_jobSchedules 'job-schedule/main.bicep' = [for (jobSchedule, index) in jobSchedules: { name: '${uniqueString(deployment().name, location)}-AutoAccount-JobSchedule-${index}' params: { automationAccountName: automationAccount.name @@ -274,7 +274,7 @@ module automationAccount_jobSchedules 'job-schedules/main.bicep' = [for (jobSche ] }] -module automationAccount_variables 'variables/main.bicep' = [for (variable, index) in variables: { +module automationAccount_variables 'variable/main.bicep' = [for (variable, index) in variables: { name: '${uniqueString(deployment().name, location)}-AutoAccount-Variable-${index}' params: { automationAccountName: automationAccount.name @@ -286,7 +286,7 @@ module automationAccount_variables 'variables/main.bicep' = [for (variable, inde } }] -module automationAccount_linkedService '../../operational-insights/workspaces/linked-services/main.bicep' = if (!empty(linkedWorkspaceResourceId)) { +module automationAccount_linkedService '../../operational-insights/workspace/linked-service/main.bicep' = if (!empty(linkedWorkspaceResourceId)) { name: '${uniqueString(deployment().name, location)}-AutoAccount-LinkedService' params: { name: 'automation' @@ -300,7 +300,7 @@ module automationAccount_linkedService '../../operational-insights/workspaces/li scope: resourceGroup(!empty(linkedWorkspaceResourceId) ? split(linkedWorkspaceResourceId, '/')[2] : subscription().subscriptionId, !empty(linkedWorkspaceResourceId) ? split(linkedWorkspaceResourceId, '/')[4] : resourceGroup().name) } -module automationAccount_solutions '../../operations-management/solutions/main.bicep' = [for (gallerySolution, index) in gallerySolutions: if (!empty(linkedWorkspaceResourceId)) { +module automationAccount_solutions '../../operations-management/solution/main.bicep' = [for (gallerySolution, index) in gallerySolutions: if (!empty(linkedWorkspaceResourceId)) { name: '${uniqueString(deployment().name, location)}-AutoAccount-Solution-${index}' params: { name: gallerySolution.name @@ -318,7 +318,7 @@ module automationAccount_solutions '../../operations-management/solutions/main.b ] }] -module automationAccount_softwareUpdateConfigurations 'software-update-configurations/main.bicep' = [for (softwareUpdateConfiguration, index) in softwareUpdateConfigurations: { +module automationAccount_softwareUpdateConfigurations 'software-update-configuration/main.bicep' = [for (softwareUpdateConfiguration, index) in softwareUpdateConfigurations: { name: '${uniqueString(deployment().name, location)}-AutoAccount-SwUpdateConfig-${index}' params: { name: softwareUpdateConfiguration.name @@ -387,7 +387,7 @@ resource automationAccount_diagnosticSettings 'Microsoft.Insights/diagnosticSett scope: automationAccount } -module automationAccount_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module automationAccount_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-AutomationAccount-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/automation/automation-accounts/main.json b/modules/automation/automation-account/main.json similarity index 100% rename from modules/automation/automation-accounts/main.json rename to modules/automation/automation-account/main.json diff --git a/modules/automation/automation-accounts/modules/README.md b/modules/automation/automation-account/modules/README.md similarity index 100% rename from modules/automation/automation-accounts/modules/README.md rename to modules/automation/automation-account/modules/README.md diff --git a/modules/automation/automation-accounts/modules/main.bicep b/modules/automation/automation-account/modules/main.bicep similarity index 100% rename from modules/automation/automation-accounts/modules/main.bicep rename to modules/automation/automation-account/modules/main.bicep diff --git a/modules/automation/automation-accounts/modules/main.json b/modules/automation/automation-account/modules/main.json similarity index 100% rename from modules/automation/automation-accounts/modules/main.json rename to modules/automation/automation-account/modules/main.json diff --git a/modules/automation/automation-accounts/modules/version.json b/modules/automation/automation-account/modules/version.json similarity index 100% rename from modules/automation/automation-accounts/modules/version.json rename to modules/automation/automation-account/modules/version.json diff --git a/modules/automation/automation-accounts/runbooks/README.md b/modules/automation/automation-account/runbooks/README.md similarity index 100% rename from modules/automation/automation-accounts/runbooks/README.md rename to modules/automation/automation-account/runbooks/README.md diff --git a/modules/automation/automation-accounts/runbooks/main.bicep b/modules/automation/automation-account/runbooks/main.bicep similarity index 100% rename from modules/automation/automation-accounts/runbooks/main.bicep rename to modules/automation/automation-account/runbooks/main.bicep diff --git a/modules/automation/automation-accounts/runbooks/main.json b/modules/automation/automation-account/runbooks/main.json similarity index 100% rename from modules/automation/automation-accounts/runbooks/main.json rename to modules/automation/automation-account/runbooks/main.json diff --git a/modules/automation/automation-accounts/runbooks/version.json b/modules/automation/automation-account/runbooks/version.json similarity index 100% rename from modules/automation/automation-accounts/runbooks/version.json rename to modules/automation/automation-account/runbooks/version.json diff --git a/modules/automation/automation-accounts/schedules/README.md b/modules/automation/automation-account/schedules/README.md similarity index 100% rename from modules/automation/automation-accounts/schedules/README.md rename to modules/automation/automation-account/schedules/README.md diff --git a/modules/automation/automation-accounts/schedules/main.bicep b/modules/automation/automation-account/schedules/main.bicep similarity index 100% rename from modules/automation/automation-accounts/schedules/main.bicep rename to modules/automation/automation-account/schedules/main.bicep diff --git a/modules/automation/automation-accounts/schedules/main.json b/modules/automation/automation-account/schedules/main.json similarity index 100% rename from modules/automation/automation-accounts/schedules/main.json rename to modules/automation/automation-account/schedules/main.json diff --git a/modules/automation/automation-accounts/schedules/version.json b/modules/automation/automation-account/schedules/version.json similarity index 100% rename from modules/automation/automation-accounts/schedules/version.json rename to modules/automation/automation-account/schedules/version.json diff --git a/modules/automation/automation-accounts/software-update-configurations/README.md b/modules/automation/automation-account/software-update-configurations/README.md similarity index 100% rename from modules/automation/automation-accounts/software-update-configurations/README.md rename to modules/automation/automation-account/software-update-configurations/README.md diff --git a/modules/automation/automation-accounts/software-update-configurations/main.bicep b/modules/automation/automation-account/software-update-configurations/main.bicep similarity index 100% rename from modules/automation/automation-accounts/software-update-configurations/main.bicep rename to modules/automation/automation-account/software-update-configurations/main.bicep diff --git a/modules/automation/automation-accounts/software-update-configurations/main.json b/modules/automation/automation-account/software-update-configurations/main.json similarity index 100% rename from modules/automation/automation-accounts/software-update-configurations/main.json rename to modules/automation/automation-account/software-update-configurations/main.json diff --git a/modules/automation/automation-accounts/software-update-configurations/version.json b/modules/automation/automation-account/software-update-configurations/version.json similarity index 100% rename from modules/automation/automation-accounts/software-update-configurations/version.json rename to modules/automation/automation-account/software-update-configurations/version.json diff --git a/modules/automation/automation-accounts/variables/README.md b/modules/automation/automation-account/variables/README.md similarity index 100% rename from modules/automation/automation-accounts/variables/README.md rename to modules/automation/automation-account/variables/README.md diff --git a/modules/automation/automation-accounts/variables/main.bicep b/modules/automation/automation-account/variables/main.bicep similarity index 100% rename from modules/automation/automation-accounts/variables/main.bicep rename to modules/automation/automation-account/variables/main.bicep diff --git a/modules/automation/automation-accounts/variables/main.json b/modules/automation/automation-account/variables/main.json similarity index 100% rename from modules/automation/automation-accounts/variables/main.json rename to modules/automation/automation-account/variables/main.json diff --git a/modules/automation/automation-accounts/variables/version.json b/modules/automation/automation-account/variables/version.json similarity index 100% rename from modules/automation/automation-accounts/variables/version.json rename to modules/automation/automation-account/variables/version.json diff --git a/modules/automation/automation-accounts/version.json b/modules/automation/automation-account/version.json similarity index 100% rename from modules/automation/automation-accounts/version.json rename to modules/automation/automation-account/version.json diff --git a/modules/batch/batch-accounts/.test/common/dependencies.bicep b/modules/batch/batch-account/.test/common/dependencies.bicep similarity index 100% rename from modules/batch/batch-accounts/.test/common/dependencies.bicep rename to modules/batch/batch-account/.test/common/dependencies.bicep diff --git a/modules/batch/batch-accounts/.test/common/main.test.bicep b/modules/batch/batch-account/.test/common/main.test.bicep similarity index 100% rename from modules/batch/batch-accounts/.test/common/main.test.bicep rename to modules/batch/batch-account/.test/common/main.test.bicep diff --git a/modules/batch/batch-accounts/.test/encr/dependencies.bicep b/modules/batch/batch-account/.test/encr/dependencies.bicep similarity index 100% rename from modules/batch/batch-accounts/.test/encr/dependencies.bicep rename to modules/batch/batch-account/.test/encr/dependencies.bicep diff --git a/modules/batch/batch-accounts/.test/encr/main.test.bicep b/modules/batch/batch-account/.test/encr/main.test.bicep similarity index 100% rename from modules/batch/batch-accounts/.test/encr/main.test.bicep rename to modules/batch/batch-account/.test/encr/main.test.bicep diff --git a/modules/batch/batch-accounts/.test/main.test.bicep b/modules/batch/batch-account/.test/main.test.bicep similarity index 100% rename from modules/batch/batch-accounts/.test/main.test.bicep rename to modules/batch/batch-account/.test/main.test.bicep diff --git a/modules/batch/batch-accounts/.test/min/dependencies.bicep b/modules/batch/batch-account/.test/min/dependencies.bicep similarity index 100% rename from modules/batch/batch-accounts/.test/min/dependencies.bicep rename to modules/batch/batch-account/.test/min/dependencies.bicep diff --git a/modules/batch/batch-accounts/.test/min/main.test.bicep b/modules/batch/batch-account/.test/min/main.test.bicep similarity index 100% rename from modules/batch/batch-accounts/.test/min/main.test.bicep rename to modules/batch/batch-account/.test/min/main.test.bicep diff --git a/modules/batch/batch-accounts/README.md b/modules/batch/batch-account/README.md similarity index 99% rename from modules/batch/batch-accounts/README.md rename to modules/batch/batch-account/README.md index 8df7a45125..f04cabf355 100644 --- a/modules/batch/batch-accounts/README.md +++ b/modules/batch/batch-account/README.md @@ -272,7 +272,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module batchAccounts './batch/batch-accounts/main.bicep' = { +module batchAccounts './batch/batch-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-bbacom' params: { // Required parameters @@ -421,7 +421,7 @@ module batchAccounts './batch/batch-accounts/main.bicep' = { via Bicep module ```bicep -module batchAccounts './batch/batch-accounts/main.bicep' = { +module batchAccounts './batch/batch-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-bbaencr' params: { // Required parameters @@ -540,7 +540,7 @@ module batchAccounts './batch/batch-accounts/main.bicep' = { via Bicep module ```bicep -module batchAccounts './batch/batch-accounts/main.bicep' = { +module batchAccounts './batch/batch-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-bbamin' params: { // Required parameters diff --git a/modules/batch/batch-accounts/main.bicep b/modules/batch/batch-account/main.bicep similarity index 99% rename from modules/batch/batch-accounts/main.bicep rename to modules/batch/batch-account/main.bicep index bbcffcf4fa..6c1bbcb34e 100644 --- a/modules/batch/batch-accounts/main.bicep +++ b/modules/batch/batch-account/main.bicep @@ -254,7 +254,7 @@ resource batchAccount_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@ scope: batchAccount } -module batchAccount_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module batchAccount_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-BatchAccount-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/batch/batch-accounts/main.json b/modules/batch/batch-account/main.json similarity index 100% rename from modules/batch/batch-accounts/main.json rename to modules/batch/batch-account/main.json diff --git a/modules/batch/batch-accounts/version.json b/modules/batch/batch-account/version.json similarity index 100% rename from modules/batch/batch-accounts/version.json rename to modules/batch/batch-account/version.json diff --git a/modules/cache/redis/main.bicep b/modules/cache/redis/main.bicep index e1c394e0ca..af50133fca 100644 --- a/modules/cache/redis/main.bicep +++ b/modules/cache/redis/main.bicep @@ -262,7 +262,7 @@ module redisCache_rbac '.bicep/nested_roleAssignments.bicep' = [for (roleAssignm } }] -module redisCache_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module redisCache_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-redisCache-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/cdn/profiles/README.md b/modules/cdn/profiles/README.md index ba5e5720dd..4f2a799d77 100644 --- a/modules/cdn/profiles/README.md +++ b/modules/cdn/profiles/README.md @@ -171,7 +171,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module profiles './cdn/profiles/main.bicep' = { +module profiles './cdn/profile/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cdnpcom' params: { // Required parameters diff --git a/modules/cdn/profiles/endpoints/README.md b/modules/cdn/profiles/endpoint/README.md similarity index 100% rename from modules/cdn/profiles/endpoints/README.md rename to modules/cdn/profiles/endpoint/README.md diff --git a/modules/cdn/profiles/endpoints/main.bicep b/modules/cdn/profiles/endpoint/main.bicep similarity index 97% rename from modules/cdn/profiles/endpoints/main.bicep rename to modules/cdn/profiles/endpoint/main.bicep index 448b1c8366..1168a8c3b9 100644 --- a/modules/cdn/profiles/endpoints/main.bicep +++ b/modules/cdn/profiles/endpoint/main.bicep @@ -46,7 +46,7 @@ resource endpoint 'microsoft.cdn/profiles/endpoints@2021-06-01' = { tags: tags } -module endpoint_origins 'origins/main.bicep' = [for origin in properties.origins: { +module endpoint_origins 'origin/main.bicep' = [for origin in properties.origins: { name: '${name}-origins-${origin.name}' params: { profileName: profile.name diff --git a/modules/cdn/profiles/endpoints/main.json b/modules/cdn/profiles/endpoint/main.json similarity index 100% rename from modules/cdn/profiles/endpoints/main.json rename to modules/cdn/profiles/endpoint/main.json diff --git a/modules/cdn/profiles/endpoints/origins/README.md b/modules/cdn/profiles/endpoint/origins/README.md similarity index 100% rename from modules/cdn/profiles/endpoints/origins/README.md rename to modules/cdn/profiles/endpoint/origins/README.md diff --git a/modules/cdn/profiles/endpoints/origins/main.bicep b/modules/cdn/profiles/endpoint/origins/main.bicep similarity index 100% rename from modules/cdn/profiles/endpoints/origins/main.bicep rename to modules/cdn/profiles/endpoint/origins/main.bicep diff --git a/modules/cdn/profiles/endpoints/origins/main.json b/modules/cdn/profiles/endpoint/origins/main.json similarity index 100% rename from modules/cdn/profiles/endpoints/origins/main.json rename to modules/cdn/profiles/endpoint/origins/main.json diff --git a/modules/cdn/profiles/endpoints/origins/version.json b/modules/cdn/profiles/endpoint/origins/version.json similarity index 100% rename from modules/cdn/profiles/endpoints/origins/version.json rename to modules/cdn/profiles/endpoint/origins/version.json diff --git a/modules/cdn/profiles/endpoints/version.json b/modules/cdn/profiles/endpoint/version.json similarity index 100% rename from modules/cdn/profiles/endpoints/version.json rename to modules/cdn/profiles/endpoint/version.json diff --git a/modules/cdn/profiles/main.bicep b/modules/cdn/profiles/main.bicep index b1d070ecd7..0e421eccd1 100644 --- a/modules/cdn/profiles/main.bicep +++ b/modules/cdn/profiles/main.bicep @@ -102,7 +102,7 @@ module profile_roleAssignments '.bicep/nested_roleAssignments.bicep' = [for (rol } }] -module profile_endpoint 'endpoints/main.bicep' = if (!empty(endpointProperties)) { +module profile_endpoint 'endpoint/main.bicep' = if (!empty(endpointProperties)) { name: '${uniqueString(deployment().name, location)}-Profile-Endpoint' params: { name: !empty(endpointName) ? endpointName : '${profile.name}-endpoint' diff --git a/modules/cognitive-services/accounts/.bicep/nested_roleAssignments.bicep b/modules/cognitive-services/account/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/cognitive-services/accounts/.bicep/nested_roleAssignments.bicep rename to modules/cognitive-services/account/.bicep/nested_roleAssignments.bicep diff --git a/modules/cognitive-services/accounts/.test/common/dependencies.bicep b/modules/cognitive-services/account/.test/common/dependencies.bicep similarity index 100% rename from modules/cognitive-services/accounts/.test/common/dependencies.bicep rename to modules/cognitive-services/account/.test/common/dependencies.bicep diff --git a/modules/cognitive-services/accounts/.test/common/main.test.bicep b/modules/cognitive-services/account/.test/common/main.test.bicep similarity index 100% rename from modules/cognitive-services/accounts/.test/common/main.test.bicep rename to modules/cognitive-services/account/.test/common/main.test.bicep diff --git a/modules/cognitive-services/accounts/.test/encr/dependencies.bicep b/modules/cognitive-services/account/.test/encr/dependencies.bicep similarity index 100% rename from modules/cognitive-services/accounts/.test/encr/dependencies.bicep rename to modules/cognitive-services/account/.test/encr/dependencies.bicep diff --git a/modules/cognitive-services/accounts/.test/encr/main.test.bicep b/modules/cognitive-services/account/.test/encr/main.test.bicep similarity index 100% rename from modules/cognitive-services/accounts/.test/encr/main.test.bicep rename to modules/cognitive-services/account/.test/encr/main.test.bicep diff --git a/modules/cognitive-services/accounts/.test/main.test.bicep b/modules/cognitive-services/account/.test/main.test.bicep similarity index 100% rename from modules/cognitive-services/accounts/.test/main.test.bicep rename to modules/cognitive-services/account/.test/main.test.bicep diff --git a/modules/cognitive-services/accounts/.test/min/main.test.bicep b/modules/cognitive-services/account/.test/min/main.test.bicep similarity index 100% rename from modules/cognitive-services/accounts/.test/min/main.test.bicep rename to modules/cognitive-services/account/.test/min/main.test.bicep diff --git a/modules/cognitive-services/accounts/.test/speech/dependencies.bicep b/modules/cognitive-services/account/.test/speech/dependencies.bicep similarity index 100% rename from modules/cognitive-services/accounts/.test/speech/dependencies.bicep rename to modules/cognitive-services/account/.test/speech/dependencies.bicep diff --git a/modules/cognitive-services/accounts/.test/speech/main.test.bicep b/modules/cognitive-services/account/.test/speech/main.test.bicep similarity index 100% rename from modules/cognitive-services/accounts/.test/speech/main.test.bicep rename to modules/cognitive-services/account/.test/speech/main.test.bicep diff --git a/modules/cognitive-services/accounts/README.md b/modules/cognitive-services/account/README.md similarity index 99% rename from modules/cognitive-services/accounts/README.md rename to modules/cognitive-services/account/README.md index 854c43d410..e8b3b80385 100644 --- a/modules/cognitive-services/accounts/README.md +++ b/modules/cognitive-services/account/README.md @@ -454,7 +454,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module accounts './cognitive-services/accounts/main.bicep' = { +module accounts './cognitive-services/account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-csacom' params: { // Required parameters @@ -639,7 +639,7 @@ module accounts './cognitive-services/accounts/main.bicep' = { via Bicep module ```bicep -module accounts './cognitive-services/accounts/main.bicep' = { +module accounts './cognitive-services/account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-csaencr' params: { // Required parameters @@ -720,7 +720,7 @@ module accounts './cognitive-services/accounts/main.bicep' = { via Bicep module ```bicep -module accounts './cognitive-services/accounts/main.bicep' = { +module accounts './cognitive-services/account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-csamin' params: { // Required parameters @@ -769,7 +769,7 @@ module accounts './cognitive-services/accounts/main.bicep' = { via Bicep module ```bicep -module accounts './cognitive-services/accounts/main.bicep' = { +module accounts './cognitive-services/account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-csaspeech' params: { // Required parameters diff --git a/modules/cognitive-services/accounts/main.bicep b/modules/cognitive-services/account/main.bicep similarity index 99% rename from modules/cognitive-services/accounts/main.bicep rename to modules/cognitive-services/account/main.bicep index a9cb752532..ffa145e7f9 100644 --- a/modules/cognitive-services/accounts/main.bicep +++ b/modules/cognitive-services/account/main.bicep @@ -297,7 +297,7 @@ resource cognitiveServices_diagnosticSettingName 'Microsoft.Insights/diagnostics scope: cognitiveServices } -module cognitiveServices_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module cognitiveServices_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-CognitiveServices-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/cognitive-services/accounts/main.json b/modules/cognitive-services/account/main.json similarity index 100% rename from modules/cognitive-services/accounts/main.json rename to modules/cognitive-services/account/main.json diff --git a/modules/cognitive-services/accounts/version.json b/modules/cognitive-services/account/version.json similarity index 100% rename from modules/cognitive-services/accounts/version.json rename to modules/cognitive-services/account/version.json diff --git a/modules/compute/availability-sets/.bicep/nested_roleAssignments.bicep b/modules/compute/availability-set/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/compute/availability-sets/.bicep/nested_roleAssignments.bicep rename to modules/compute/availability-set/.bicep/nested_roleAssignments.bicep diff --git a/modules/compute/availability-sets/.test/common/dependencies.bicep b/modules/compute/availability-set/.test/common/dependencies.bicep similarity index 100% rename from modules/compute/availability-sets/.test/common/dependencies.bicep rename to modules/compute/availability-set/.test/common/dependencies.bicep diff --git a/modules/compute/availability-sets/.test/common/main.test.bicep b/modules/compute/availability-set/.test/common/main.test.bicep similarity index 100% rename from modules/compute/availability-sets/.test/common/main.test.bicep rename to modules/compute/availability-set/.test/common/main.test.bicep diff --git a/modules/compute/availability-sets/.test/main.test.bicep b/modules/compute/availability-set/.test/main.test.bicep similarity index 100% rename from modules/compute/availability-sets/.test/main.test.bicep rename to modules/compute/availability-set/.test/main.test.bicep diff --git a/modules/compute/availability-sets/.test/min/main.test.bicep b/modules/compute/availability-set/.test/min/main.test.bicep similarity index 100% rename from modules/compute/availability-sets/.test/min/main.test.bicep rename to modules/compute/availability-set/.test/min/main.test.bicep diff --git a/modules/compute/availability-sets/README.md b/modules/compute/availability-set/README.md similarity index 98% rename from modules/compute/availability-sets/README.md rename to modules/compute/availability-set/README.md index 550cd7f2d8..fa366dbd48 100644 --- a/modules/compute/availability-sets/README.md +++ b/modules/compute/availability-set/README.md @@ -168,7 +168,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module availabilitySets './compute/availability-sets/main.bicep' = { +module availabilitySets './compute/availability-set/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cascom' params: { // Required parameters @@ -251,7 +251,7 @@ module availabilitySets './compute/availability-sets/main.bicep' = { via Bicep module ```bicep -module availabilitySets './compute/availability-sets/main.bicep' = { +module availabilitySets './compute/availability-set/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-casmin' params: { // Required parameters diff --git a/modules/compute/availability-sets/main.bicep b/modules/compute/availability-set/main.bicep similarity index 100% rename from modules/compute/availability-sets/main.bicep rename to modules/compute/availability-set/main.bicep diff --git a/modules/compute/availability-sets/main.json b/modules/compute/availability-set/main.json similarity index 100% rename from modules/compute/availability-sets/main.json rename to modules/compute/availability-set/main.json diff --git a/modules/compute/availability-sets/version.json b/modules/compute/availability-set/version.json similarity index 100% rename from modules/compute/availability-sets/version.json rename to modules/compute/availability-set/version.json diff --git a/modules/compute/disk-encryption-sets/.bicep/nested_keyVaultPermissions.bicep b/modules/compute/disk-encryption-set/.bicep/nested_keyVaultPermissions.bicep similarity index 94% rename from modules/compute/disk-encryption-sets/.bicep/nested_keyVaultPermissions.bicep rename to modules/compute/disk-encryption-set/.bicep/nested_keyVaultPermissions.bicep index a4a511d54a..22a719438c 100644 --- a/modules/compute/disk-encryption-sets/.bicep/nested_keyVaultPermissions.bicep +++ b/modules/compute/disk-encryption-set/.bicep/nested_keyVaultPermissions.bicep @@ -47,7 +47,7 @@ resource keyVaultKeyRBAC 'Microsoft.Authorization/roleAssignments@2022-04-01' = // Access Policy // // ============= // -module keyVaultAccessPolicies '../../../key-vault/vaults/access-policies/main.bicep' = if (rbacAuthorizationEnabled != true) { +module keyVaultAccessPolicies '../../../key-vault/vault/access-policy/main.bicep' = if (rbacAuthorizationEnabled != true) { name: '${uniqueString(deployment().name, location)}-DiskEncrSet-KVAccessPolicies' params: { keyVaultName: last(split(keyVaultResourceId, '/'))! diff --git a/modules/compute/disk-encryption-sets/.bicep/nested_managedIdentityReference.bicep b/modules/compute/disk-encryption-set/.bicep/nested_managedIdentityReference.bicep similarity index 100% rename from modules/compute/disk-encryption-sets/.bicep/nested_managedIdentityReference.bicep rename to modules/compute/disk-encryption-set/.bicep/nested_managedIdentityReference.bicep diff --git a/modules/compute/disk-encryption-sets/.bicep/nested_roleAssignments.bicep b/modules/compute/disk-encryption-set/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/compute/disk-encryption-sets/.bicep/nested_roleAssignments.bicep rename to modules/compute/disk-encryption-set/.bicep/nested_roleAssignments.bicep diff --git a/modules/compute/disk-encryption-sets/.test/accessPolicies/dependencies.bicep b/modules/compute/disk-encryption-set/.test/accessPolicies/dependencies.bicep similarity index 100% rename from modules/compute/disk-encryption-sets/.test/accessPolicies/dependencies.bicep rename to modules/compute/disk-encryption-set/.test/accessPolicies/dependencies.bicep diff --git a/modules/compute/disk-encryption-sets/.test/accessPolicies/main.test.bicep b/modules/compute/disk-encryption-set/.test/accessPolicies/main.test.bicep similarity index 100% rename from modules/compute/disk-encryption-sets/.test/accessPolicies/main.test.bicep rename to modules/compute/disk-encryption-set/.test/accessPolicies/main.test.bicep diff --git a/modules/compute/disk-encryption-sets/.test/common/dependencies.bicep b/modules/compute/disk-encryption-set/.test/common/dependencies.bicep similarity index 100% rename from modules/compute/disk-encryption-sets/.test/common/dependencies.bicep rename to modules/compute/disk-encryption-set/.test/common/dependencies.bicep diff --git a/modules/compute/disk-encryption-sets/.test/common/main.test.bicep b/modules/compute/disk-encryption-set/.test/common/main.test.bicep similarity index 100% rename from modules/compute/disk-encryption-sets/.test/common/main.test.bicep rename to modules/compute/disk-encryption-set/.test/common/main.test.bicep diff --git a/modules/compute/disk-encryption-sets/.test/main.test.bicep b/modules/compute/disk-encryption-set/.test/main.test.bicep similarity index 100% rename from modules/compute/disk-encryption-sets/.test/main.test.bicep rename to modules/compute/disk-encryption-set/.test/main.test.bicep diff --git a/modules/compute/disk-encryption-sets/README.md b/modules/compute/disk-encryption-set/README.md similarity index 98% rename from modules/compute/disk-encryption-sets/README.md rename to modules/compute/disk-encryption-set/README.md index fbe57723c5..17dd652977 100644 --- a/modules/compute/disk-encryption-sets/README.md +++ b/modules/compute/disk-encryption-set/README.md @@ -219,7 +219,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module diskEncryptionSets './compute/disk-encryption-sets/main.bicep' = { +module diskEncryptionSets './compute/disk-encryption-set/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cdesap' params: { // Required parameters @@ -314,7 +314,7 @@ module diskEncryptionSets './compute/disk-encryption-sets/main.bicep' = { via Bicep module ```bicep -module diskEncryptionSets './compute/disk-encryption-sets/main.bicep' = { +module diskEncryptionSets './compute/disk-encryption-set/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cdescom' params: { // Required parameters diff --git a/modules/compute/disk-encryption-sets/main.bicep b/modules/compute/disk-encryption-set/main.bicep similarity index 100% rename from modules/compute/disk-encryption-sets/main.bicep rename to modules/compute/disk-encryption-set/main.bicep diff --git a/modules/compute/disk-encryption-sets/main.json b/modules/compute/disk-encryption-set/main.json similarity index 100% rename from modules/compute/disk-encryption-sets/main.json rename to modules/compute/disk-encryption-set/main.json diff --git a/modules/compute/disk-encryption-sets/version.json b/modules/compute/disk-encryption-set/version.json similarity index 100% rename from modules/compute/disk-encryption-sets/version.json rename to modules/compute/disk-encryption-set/version.json diff --git a/modules/compute/disks/.bicep/nested_roleAssignments.bicep b/modules/compute/disk/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/compute/disks/.bicep/nested_roleAssignments.bicep rename to modules/compute/disk/.bicep/nested_roleAssignments.bicep diff --git a/modules/compute/disks/.test/common/dependencies.bicep b/modules/compute/disk/.test/common/dependencies.bicep similarity index 100% rename from modules/compute/disks/.test/common/dependencies.bicep rename to modules/compute/disk/.test/common/dependencies.bicep diff --git a/modules/compute/disks/.test/common/main.test.bicep b/modules/compute/disk/.test/common/main.test.bicep similarity index 100% rename from modules/compute/disks/.test/common/main.test.bicep rename to modules/compute/disk/.test/common/main.test.bicep diff --git a/modules/compute/disks/.test/image/dependencies.bicep b/modules/compute/disk/.test/image/dependencies.bicep similarity index 100% rename from modules/compute/disks/.test/image/dependencies.bicep rename to modules/compute/disk/.test/image/dependencies.bicep diff --git a/modules/compute/disks/.test/image/main.test.bicep b/modules/compute/disk/.test/image/main.test.bicep similarity index 100% rename from modules/compute/disks/.test/image/main.test.bicep rename to modules/compute/disk/.test/image/main.test.bicep diff --git a/modules/compute/disks/.test/import/dependencies.bicep b/modules/compute/disk/.test/import/dependencies.bicep similarity index 100% rename from modules/compute/disks/.test/import/dependencies.bicep rename to modules/compute/disk/.test/import/dependencies.bicep diff --git a/modules/compute/disks/.test/import/dependencies_rbac.bicep b/modules/compute/disk/.test/import/dependencies_rbac.bicep similarity index 100% rename from modules/compute/disks/.test/import/dependencies_rbac.bicep rename to modules/compute/disk/.test/import/dependencies_rbac.bicep diff --git a/modules/compute/disks/.test/import/main.test.bicep b/modules/compute/disk/.test/import/main.test.bicep similarity index 100% rename from modules/compute/disks/.test/import/main.test.bicep rename to modules/compute/disk/.test/import/main.test.bicep diff --git a/modules/compute/disks/.test/main.test.bicep b/modules/compute/disk/.test/main.test.bicep similarity index 100% rename from modules/compute/disks/.test/main.test.bicep rename to modules/compute/disk/.test/main.test.bicep diff --git a/modules/compute/disks/.test/min/main.test.bicep b/modules/compute/disk/.test/min/main.test.bicep similarity index 100% rename from modules/compute/disks/.test/min/main.test.bicep rename to modules/compute/disk/.test/min/main.test.bicep diff --git a/modules/compute/disks/README.md b/modules/compute/disk/README.md similarity index 98% rename from modules/compute/disks/README.md rename to modules/compute/disk/README.md index 0f48d42e5a..2e75ba784e 100644 --- a/modules/compute/disks/README.md +++ b/modules/compute/disk/README.md @@ -191,7 +191,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module disks './compute/disks/main.bicep' = { +module disks './compute/disk/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cdcom' params: { // Required parameters @@ -298,7 +298,7 @@ module disks './compute/disks/main.bicep' = { via Bicep module ```bicep -module disks './compute/disks/main.bicep' = { +module disks './compute/disk/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cdimg' params: { // Required parameters @@ -385,7 +385,7 @@ module disks './compute/disks/main.bicep' = { via Bicep module ```bicep -module disks './compute/disks/main.bicep' = { +module disks './compute/disk/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cdimp' params: { // Required parameters @@ -476,7 +476,7 @@ module disks './compute/disks/main.bicep' = { via Bicep module ```bicep -module disks './compute/disks/main.bicep' = { +module disks './compute/disk/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cdmin' params: { // Required parameters diff --git a/modules/compute/disks/main.bicep b/modules/compute/disk/main.bicep similarity index 100% rename from modules/compute/disks/main.bicep rename to modules/compute/disk/main.bicep diff --git a/modules/compute/disks/main.json b/modules/compute/disk/main.json similarity index 100% rename from modules/compute/disks/main.json rename to modules/compute/disk/main.json diff --git a/modules/compute/disks/version.json b/modules/compute/disk/version.json similarity index 100% rename from modules/compute/disks/version.json rename to modules/compute/disk/version.json diff --git a/modules/compute/galleries/.bicep/nested_roleAssignments.bicep b/modules/compute/gallery/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/compute/galleries/.bicep/nested_roleAssignments.bicep rename to modules/compute/gallery/.bicep/nested_roleAssignments.bicep diff --git a/modules/compute/galleries/.test/common/dependencies.bicep b/modules/compute/gallery/.test/common/dependencies.bicep similarity index 100% rename from modules/compute/galleries/.test/common/dependencies.bicep rename to modules/compute/gallery/.test/common/dependencies.bicep diff --git a/modules/compute/galleries/.test/common/main.test.bicep b/modules/compute/gallery/.test/common/main.test.bicep similarity index 100% rename from modules/compute/galleries/.test/common/main.test.bicep rename to modules/compute/gallery/.test/common/main.test.bicep diff --git a/modules/compute/galleries/.test/main.test.bicep b/modules/compute/gallery/.test/main.test.bicep similarity index 100% rename from modules/compute/galleries/.test/main.test.bicep rename to modules/compute/gallery/.test/main.test.bicep diff --git a/modules/compute/galleries/.test/min/main.test.bicep b/modules/compute/gallery/.test/min/main.test.bicep similarity index 100% rename from modules/compute/galleries/.test/min/main.test.bicep rename to modules/compute/gallery/.test/min/main.test.bicep diff --git a/modules/compute/galleries/README.md b/modules/compute/gallery/README.md similarity index 99% rename from modules/compute/galleries/README.md rename to modules/compute/gallery/README.md index 4a8cc34871..c51c47f081 100644 --- a/modules/compute/galleries/README.md +++ b/modules/compute/gallery/README.md @@ -169,7 +169,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module galleries './compute/galleries/main.bicep' = { +module galleries './compute/gallery/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cgcom' params: { // Required parameters @@ -506,7 +506,7 @@ module galleries './compute/galleries/main.bicep' = { via Bicep module ```bicep -module galleries './compute/galleries/main.bicep' = { +module galleries './compute/gallery/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cgmin' params: { // Required parameters diff --git a/modules/compute/galleries/applications/.bicep/nested_roleAssignments.bicep b/modules/compute/gallery/applications/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/compute/galleries/applications/.bicep/nested_roleAssignments.bicep rename to modules/compute/gallery/applications/.bicep/nested_roleAssignments.bicep diff --git a/modules/compute/galleries/applications/README.md b/modules/compute/gallery/applications/README.md similarity index 100% rename from modules/compute/galleries/applications/README.md rename to modules/compute/gallery/applications/README.md diff --git a/modules/compute/galleries/applications/main.bicep b/modules/compute/gallery/applications/main.bicep similarity index 100% rename from modules/compute/galleries/applications/main.bicep rename to modules/compute/gallery/applications/main.bicep diff --git a/modules/compute/galleries/applications/main.json b/modules/compute/gallery/applications/main.json similarity index 100% rename from modules/compute/galleries/applications/main.json rename to modules/compute/gallery/applications/main.json diff --git a/modules/compute/galleries/applications/version.json b/modules/compute/gallery/applications/version.json similarity index 100% rename from modules/compute/galleries/applications/version.json rename to modules/compute/gallery/applications/version.json diff --git a/modules/compute/galleries/images/.bicep/nested_roleAssignments.bicep b/modules/compute/gallery/images/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/compute/galleries/images/.bicep/nested_roleAssignments.bicep rename to modules/compute/gallery/images/.bicep/nested_roleAssignments.bicep diff --git a/modules/compute/galleries/images/README.md b/modules/compute/gallery/images/README.md similarity index 100% rename from modules/compute/galleries/images/README.md rename to modules/compute/gallery/images/README.md diff --git a/modules/compute/galleries/images/main.bicep b/modules/compute/gallery/images/main.bicep similarity index 100% rename from modules/compute/galleries/images/main.bicep rename to modules/compute/gallery/images/main.bicep diff --git a/modules/compute/galleries/images/main.json b/modules/compute/gallery/images/main.json similarity index 100% rename from modules/compute/galleries/images/main.json rename to modules/compute/gallery/images/main.json diff --git a/modules/compute/galleries/images/version.json b/modules/compute/gallery/images/version.json similarity index 100% rename from modules/compute/galleries/images/version.json rename to modules/compute/gallery/images/version.json diff --git a/modules/compute/galleries/main.bicep b/modules/compute/gallery/main.bicep similarity index 97% rename from modules/compute/galleries/main.bicep rename to modules/compute/gallery/main.bicep index 3116b48b21..e3caa5992b 100644 --- a/modules/compute/galleries/main.bicep +++ b/modules/compute/gallery/main.bicep @@ -82,7 +82,7 @@ module gallery_roleAssignments '.bicep/nested_roleAssignments.bicep' = [for (rol }] // Applications -module galleries_applications 'applications/main.bicep' = [for (application, index) in applications: { +module galleries_applications 'application/main.bicep' = [for (application, index) in applications: { name: '${uniqueString(deployment().name, location)}-Gallery-Application-${index}' params: { name: application.name @@ -101,7 +101,7 @@ module galleries_applications 'applications/main.bicep' = [for (application, ind }] // Images -module galleries_images 'images/main.bicep' = [for (image, index) in images: { +module galleries_images 'image/main.bicep' = [for (image, index) in images: { name: '${uniqueString(deployment().name, location)}-Gallery-Image-${index}' params: { name: image.name diff --git a/modules/compute/galleries/main.json b/modules/compute/gallery/main.json similarity index 100% rename from modules/compute/galleries/main.json rename to modules/compute/gallery/main.json diff --git a/modules/compute/galleries/version.json b/modules/compute/gallery/version.json similarity index 100% rename from modules/compute/galleries/version.json rename to modules/compute/gallery/version.json diff --git a/modules/compute/images/.bicep/nested_roleAssignments.bicep b/modules/compute/image/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/compute/images/.bicep/nested_roleAssignments.bicep rename to modules/compute/image/.bicep/nested_roleAssignments.bicep diff --git a/modules/compute/images/.test/common/dependencies.bicep b/modules/compute/image/.test/common/dependencies.bicep similarity index 100% rename from modules/compute/images/.test/common/dependencies.bicep rename to modules/compute/image/.test/common/dependencies.bicep diff --git a/modules/compute/images/.test/common/dependencies_rbac.bicep b/modules/compute/image/.test/common/dependencies_rbac.bicep similarity index 100% rename from modules/compute/images/.test/common/dependencies_rbac.bicep rename to modules/compute/image/.test/common/dependencies_rbac.bicep diff --git a/modules/compute/images/.test/common/main.test.bicep b/modules/compute/image/.test/common/main.test.bicep similarity index 100% rename from modules/compute/images/.test/common/main.test.bicep rename to modules/compute/image/.test/common/main.test.bicep diff --git a/modules/compute/images/.test/main.test.bicep b/modules/compute/image/.test/main.test.bicep similarity index 100% rename from modules/compute/images/.test/main.test.bicep rename to modules/compute/image/.test/main.test.bicep diff --git a/modules/compute/images/README.md b/modules/compute/image/README.md similarity index 99% rename from modules/compute/images/README.md rename to modules/compute/image/README.md index 9a19d64f01..6257c38168 100644 --- a/modules/compute/images/README.md +++ b/modules/compute/image/README.md @@ -176,7 +176,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module images './compute/images/main.bicep' = { +module images './compute/image/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cicom' params: { // Required parameters diff --git a/modules/compute/images/main.bicep b/modules/compute/image/main.bicep similarity index 100% rename from modules/compute/images/main.bicep rename to modules/compute/image/main.bicep diff --git a/modules/compute/images/main.json b/modules/compute/image/main.json similarity index 100% rename from modules/compute/images/main.json rename to modules/compute/image/main.json diff --git a/modules/compute/images/version.json b/modules/compute/image/version.json similarity index 100% rename from modules/compute/images/version.json rename to modules/compute/image/version.json diff --git a/modules/compute/proximity-placement-groups/.bicep/nested_roleAssignments.bicep b/modules/compute/proximity-placement-group/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/compute/proximity-placement-groups/.bicep/nested_roleAssignments.bicep rename to modules/compute/proximity-placement-group/.bicep/nested_roleAssignments.bicep diff --git a/modules/compute/proximity-placement-groups/.test/common/dependencies.bicep b/modules/compute/proximity-placement-group/.test/common/dependencies.bicep similarity index 100% rename from modules/compute/proximity-placement-groups/.test/common/dependencies.bicep rename to modules/compute/proximity-placement-group/.test/common/dependencies.bicep diff --git a/modules/compute/proximity-placement-groups/.test/common/main.test.bicep b/modules/compute/proximity-placement-group/.test/common/main.test.bicep similarity index 100% rename from modules/compute/proximity-placement-groups/.test/common/main.test.bicep rename to modules/compute/proximity-placement-group/.test/common/main.test.bicep diff --git a/modules/compute/proximity-placement-groups/.test/main.test.bicep b/modules/compute/proximity-placement-group/.test/main.test.bicep similarity index 100% rename from modules/compute/proximity-placement-groups/.test/main.test.bicep rename to modules/compute/proximity-placement-group/.test/main.test.bicep diff --git a/modules/compute/proximity-placement-groups/.test/min/main.test.bicep b/modules/compute/proximity-placement-group/.test/min/main.test.bicep similarity index 100% rename from modules/compute/proximity-placement-groups/.test/min/main.test.bicep rename to modules/compute/proximity-placement-group/.test/min/main.test.bicep diff --git a/modules/compute/proximity-placement-groups/README.md b/modules/compute/proximity-placement-group/README.md similarity index 99% rename from modules/compute/proximity-placement-groups/README.md rename to modules/compute/proximity-placement-group/README.md index 6ddd45bde8..3ab6782041 100644 --- a/modules/compute/proximity-placement-groups/README.md +++ b/modules/compute/proximity-placement-group/README.md @@ -168,7 +168,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module proximityPlacementGroups './compute/proximity-placement-groups/main.bicep' = { +module proximityPlacementGroups './compute/proximity-placement-group/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cppgcom' params: { // Required parameters @@ -287,7 +287,7 @@ module proximityPlacementGroups './compute/proximity-placement-groups/main.bicep via Bicep module ```bicep -module proximityPlacementGroups './compute/proximity-placement-groups/main.bicep' = { +module proximityPlacementGroups './compute/proximity-placement-group/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cppgmin' params: { // Required parameters diff --git a/modules/compute/proximity-placement-groups/main.bicep b/modules/compute/proximity-placement-group/main.bicep similarity index 100% rename from modules/compute/proximity-placement-groups/main.bicep rename to modules/compute/proximity-placement-group/main.bicep diff --git a/modules/compute/proximity-placement-groups/main.json b/modules/compute/proximity-placement-group/main.json similarity index 100% rename from modules/compute/proximity-placement-groups/main.json rename to modules/compute/proximity-placement-group/main.json diff --git a/modules/compute/proximity-placement-groups/version.json b/modules/compute/proximity-placement-group/version.json similarity index 100% rename from modules/compute/proximity-placement-groups/version.json rename to modules/compute/proximity-placement-group/version.json diff --git a/modules/compute/ssh-public-keys/.bicep/nested_roleAssignments.bicep b/modules/compute/ssh-public-key/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/compute/ssh-public-keys/.bicep/nested_roleAssignments.bicep rename to modules/compute/ssh-public-key/.bicep/nested_roleAssignments.bicep diff --git a/modules/compute/ssh-public-keys/.test/common/dependencies.bicep b/modules/compute/ssh-public-key/.test/common/dependencies.bicep similarity index 100% rename from modules/compute/ssh-public-keys/.test/common/dependencies.bicep rename to modules/compute/ssh-public-key/.test/common/dependencies.bicep diff --git a/modules/compute/ssh-public-keys/.test/common/main.test.bicep b/modules/compute/ssh-public-key/.test/common/main.test.bicep similarity index 100% rename from modules/compute/ssh-public-keys/.test/common/main.test.bicep rename to modules/compute/ssh-public-key/.test/common/main.test.bicep diff --git a/modules/compute/ssh-public-keys/.test/main.test.bicep b/modules/compute/ssh-public-key/.test/main.test.bicep similarity index 100% rename from modules/compute/ssh-public-keys/.test/main.test.bicep rename to modules/compute/ssh-public-key/.test/main.test.bicep diff --git a/modules/compute/ssh-public-keys/.test/min/main.test.bicep b/modules/compute/ssh-public-key/.test/min/main.test.bicep similarity index 100% rename from modules/compute/ssh-public-keys/.test/min/main.test.bicep rename to modules/compute/ssh-public-key/.test/min/main.test.bicep diff --git a/modules/compute/ssh-public-keys/README.md b/modules/compute/ssh-public-key/README.md similarity index 98% rename from modules/compute/ssh-public-keys/README.md rename to modules/compute/ssh-public-key/README.md index 1872180576..33f77453fd 100644 --- a/modules/compute/ssh-public-keys/README.md +++ b/modules/compute/ssh-public-key/README.md @@ -167,7 +167,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module sshPublicKeys './compute/ssh-public-keys/main.bicep' = { +module sshPublicKeys './compute/ssh-public-key/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cspkcom' params: { // Required parameters @@ -216,7 +216,7 @@ module sshPublicKeys './compute/ssh-public-keys/main.bicep' = { via Bicep module ```bicep -module sshPublicKeys './compute/ssh-public-keys/main.bicep' = { +module sshPublicKeys './compute/ssh-public-key/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cspkmin' params: { // Required parameters diff --git a/modules/compute/ssh-public-keys/main.bicep b/modules/compute/ssh-public-key/main.bicep similarity index 100% rename from modules/compute/ssh-public-keys/main.bicep rename to modules/compute/ssh-public-key/main.bicep diff --git a/modules/compute/ssh-public-keys/main.json b/modules/compute/ssh-public-key/main.json similarity index 100% rename from modules/compute/ssh-public-keys/main.json rename to modules/compute/ssh-public-key/main.json diff --git a/modules/compute/ssh-public-keys/version.json b/modules/compute/ssh-public-key/version.json similarity index 100% rename from modules/compute/ssh-public-keys/version.json rename to modules/compute/ssh-public-key/version.json diff --git a/modules/compute/virtual-machine-scale-sets/.bicep/nested_roleAssignments.bicep b/modules/compute/virtual-machine-scale-set/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/compute/virtual-machine-scale-sets/.bicep/nested_roleAssignments.bicep rename to modules/compute/virtual-machine-scale-set/.bicep/nested_roleAssignments.bicep diff --git a/modules/compute/virtual-machine-scale-sets/.test/linux.min/dependencies.bicep b/modules/compute/virtual-machine-scale-set/.test/linux.min/dependencies.bicep similarity index 100% rename from modules/compute/virtual-machine-scale-sets/.test/linux.min/dependencies.bicep rename to modules/compute/virtual-machine-scale-set/.test/linux.min/dependencies.bicep diff --git a/modules/compute/virtual-machine-scale-sets/.test/linux.min/main.test.bicep b/modules/compute/virtual-machine-scale-set/.test/linux.min/main.test.bicep similarity index 100% rename from modules/compute/virtual-machine-scale-sets/.test/linux.min/main.test.bicep rename to modules/compute/virtual-machine-scale-set/.test/linux.min/main.test.bicep diff --git a/modules/compute/virtual-machine-scale-sets/.test/linux.ssecmk/dependencies.bicep b/modules/compute/virtual-machine-scale-set/.test/linux.ssecmk/dependencies.bicep similarity index 100% rename from modules/compute/virtual-machine-scale-sets/.test/linux.ssecmk/dependencies.bicep rename to modules/compute/virtual-machine-scale-set/.test/linux.ssecmk/dependencies.bicep diff --git a/modules/compute/virtual-machine-scale-sets/.test/linux.ssecmk/main.test.bicep b/modules/compute/virtual-machine-scale-set/.test/linux.ssecmk/main.test.bicep similarity index 100% rename from modules/compute/virtual-machine-scale-sets/.test/linux.ssecmk/main.test.bicep rename to modules/compute/virtual-machine-scale-set/.test/linux.ssecmk/main.test.bicep diff --git a/modules/compute/virtual-machine-scale-sets/.test/linux/dependencies.bicep b/modules/compute/virtual-machine-scale-set/.test/linux/dependencies.bicep similarity index 100% rename from modules/compute/virtual-machine-scale-sets/.test/linux/dependencies.bicep rename to modules/compute/virtual-machine-scale-set/.test/linux/dependencies.bicep diff --git a/modules/compute/virtual-machine-scale-sets/.test/linux/main.test.bicep b/modules/compute/virtual-machine-scale-set/.test/linux/main.test.bicep similarity index 100% rename from modules/compute/virtual-machine-scale-sets/.test/linux/main.test.bicep rename to modules/compute/virtual-machine-scale-set/.test/linux/main.test.bicep diff --git a/modules/compute/virtual-machine-scale-sets/.test/main.test.bicep b/modules/compute/virtual-machine-scale-set/.test/main.test.bicep similarity index 100% rename from modules/compute/virtual-machine-scale-sets/.test/main.test.bicep rename to modules/compute/virtual-machine-scale-set/.test/main.test.bicep diff --git a/modules/compute/virtual-machine-scale-sets/.test/windows.min/dependencies.bicep b/modules/compute/virtual-machine-scale-set/.test/windows.min/dependencies.bicep similarity index 100% rename from modules/compute/virtual-machine-scale-sets/.test/windows.min/dependencies.bicep rename to modules/compute/virtual-machine-scale-set/.test/windows.min/dependencies.bicep diff --git a/modules/compute/virtual-machine-scale-sets/.test/windows.min/main.test.bicep b/modules/compute/virtual-machine-scale-set/.test/windows.min/main.test.bicep similarity index 100% rename from modules/compute/virtual-machine-scale-sets/.test/windows.min/main.test.bicep rename to modules/compute/virtual-machine-scale-set/.test/windows.min/main.test.bicep diff --git a/modules/compute/virtual-machine-scale-sets/.test/windows/dependencies.bicep b/modules/compute/virtual-machine-scale-set/.test/windows/dependencies.bicep similarity index 100% rename from modules/compute/virtual-machine-scale-sets/.test/windows/dependencies.bicep rename to modules/compute/virtual-machine-scale-set/.test/windows/dependencies.bicep diff --git a/modules/compute/virtual-machine-scale-sets/.test/windows/main.test.bicep b/modules/compute/virtual-machine-scale-set/.test/windows/main.test.bicep similarity index 100% rename from modules/compute/virtual-machine-scale-sets/.test/windows/main.test.bicep rename to modules/compute/virtual-machine-scale-set/.test/windows/main.test.bicep diff --git a/modules/compute/virtual-machine-scale-sets/README.md b/modules/compute/virtual-machine-scale-set/README.md similarity index 99% rename from modules/compute/virtual-machine-scale-sets/README.md rename to modules/compute/virtual-machine-scale-set/README.md index 329600c619..a4541f1d29 100644 --- a/modules/compute/virtual-machine-scale-sets/README.md +++ b/modules/compute/virtual-machine-scale-set/README.md @@ -909,7 +909,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module virtualMachineScaleSets './compute/virtual-machine-scale-sets/main.bicep' = { +module virtualMachineScaleSets './compute/virtual-machine-scale-set/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cvmsslin' params: { // Required parameters @@ -1262,7 +1262,7 @@ module virtualMachineScaleSets './compute/virtual-machine-scale-sets/main.bicep' via Bicep module ```bicep -module virtualMachineScaleSets './compute/virtual-machine-scale-sets/main.bicep' = { +module virtualMachineScaleSets './compute/virtual-machine-scale-set/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cvmsslinmin' params: { // Required parameters @@ -1399,7 +1399,7 @@ module virtualMachineScaleSets './compute/virtual-machine-scale-sets/main.bicep' via Bicep module ```bicep -module virtualMachineScaleSets './compute/virtual-machine-scale-sets/main.bicep' = { +module virtualMachineScaleSets './compute/virtual-machine-scale-set/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cvmsslcmk' params: { // Required parameters @@ -1584,7 +1584,7 @@ module virtualMachineScaleSets './compute/virtual-machine-scale-sets/main.bicep' via Bicep module ```bicep -module virtualMachineScaleSets './compute/virtual-machine-scale-sets/main.bicep' = { +module virtualMachineScaleSets './compute/virtual-machine-scale-set/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cvmsswin' params: { // Required parameters @@ -1919,7 +1919,7 @@ module virtualMachineScaleSets './compute/virtual-machine-scale-sets/main.bicep' via Bicep module ```bicep -module virtualMachineScaleSets './compute/virtual-machine-scale-sets/main.bicep' = { +module virtualMachineScaleSets './compute/virtual-machine-scale-set/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cvmsswinmin' params: { // Required parameters diff --git a/modules/compute/virtual-machine-scale-sets/extensions/README.md b/modules/compute/virtual-machine-scale-set/extensions/README.md similarity index 100% rename from modules/compute/virtual-machine-scale-sets/extensions/README.md rename to modules/compute/virtual-machine-scale-set/extensions/README.md diff --git a/modules/compute/virtual-machine-scale-sets/extensions/main.bicep b/modules/compute/virtual-machine-scale-set/extensions/main.bicep similarity index 100% rename from modules/compute/virtual-machine-scale-sets/extensions/main.bicep rename to modules/compute/virtual-machine-scale-set/extensions/main.bicep diff --git a/modules/compute/virtual-machine-scale-sets/extensions/main.json b/modules/compute/virtual-machine-scale-set/extensions/main.json similarity index 100% rename from modules/compute/virtual-machine-scale-sets/extensions/main.json rename to modules/compute/virtual-machine-scale-set/extensions/main.json diff --git a/modules/compute/virtual-machine-scale-sets/extensions/version.json b/modules/compute/virtual-machine-scale-set/extensions/version.json similarity index 100% rename from modules/compute/virtual-machine-scale-sets/extensions/version.json rename to modules/compute/virtual-machine-scale-set/extensions/version.json diff --git a/modules/compute/virtual-machine-scale-sets/main.bicep b/modules/compute/virtual-machine-scale-set/main.bicep similarity index 97% rename from modules/compute/virtual-machine-scale-sets/main.bicep rename to modules/compute/virtual-machine-scale-set/main.bicep index f4ddefb5fc..129d0fbec0 100644 --- a/modules/compute/virtual-machine-scale-sets/main.bicep +++ b/modules/compute/virtual-machine-scale-set/main.bicep @@ -474,7 +474,7 @@ resource vmss 'Microsoft.Compute/virtualMachineScaleSets@2022-11-01' = { plan: !empty(plan) ? plan : null } -module vmss_domainJoinExtension 'extensions/main.bicep' = if (extensionDomainJoinConfig.enabled) { +module vmss_domainJoinExtension 'extension/main.bicep' = if (extensionDomainJoinConfig.enabled) { name: '${uniqueString(deployment().name, location)}-VMSS-DomainJoin' params: { virtualMachineScaleSetName: vmss.name @@ -492,7 +492,7 @@ module vmss_domainJoinExtension 'extensions/main.bicep' = if (extensionDomainJoi } } -module vmss_microsoftAntiMalwareExtension 'extensions/main.bicep' = if (extensionAntiMalwareConfig.enabled) { +module vmss_microsoftAntiMalwareExtension 'extension/main.bicep' = if (extensionAntiMalwareConfig.enabled) { name: '${uniqueString(deployment().name, location)}-VMSS-MicrosoftAntiMalware' params: { virtualMachineScaleSetName: vmss.name @@ -512,7 +512,7 @@ resource vmss_logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@20 scope: resourceGroup(split(monitoringWorkspaceId, '/')[2], split(monitoringWorkspaceId, '/')[4]) } -module vmss_microsoftMonitoringAgentExtension 'extensions/main.bicep' = if (extensionMonitoringAgentConfig.enabled) { +module vmss_microsoftMonitoringAgentExtension 'extension/main.bicep' = if (extensionMonitoringAgentConfig.enabled) { name: '${uniqueString(deployment().name, location)}-VMSS-MicrosoftMonitoringAgent' params: { virtualMachineScaleSetName: vmss.name @@ -532,7 +532,7 @@ module vmss_microsoftMonitoringAgentExtension 'extensions/main.bicep' = if (exte } } -module vmss_dependencyAgentExtension 'extensions/main.bicep' = if (extensionDependencyAgentConfig.enabled) { +module vmss_dependencyAgentExtension 'extension/main.bicep' = if (extensionDependencyAgentConfig.enabled) { name: '${uniqueString(deployment().name, location)}-VMSS-DependencyAgent' params: { virtualMachineScaleSetName: vmss.name @@ -546,7 +546,7 @@ module vmss_dependencyAgentExtension 'extensions/main.bicep' = if (extensionDepe } } -module vmss_networkWatcherAgentExtension 'extensions/main.bicep' = if (extensionNetworkWatcherAgentConfig.enabled) { +module vmss_networkWatcherAgentExtension 'extension/main.bicep' = if (extensionNetworkWatcherAgentConfig.enabled) { name: '${uniqueString(deployment().name, location)}-VMSS-NetworkWatcherAgent' params: { virtualMachineScaleSetName: vmss.name @@ -560,7 +560,7 @@ module vmss_networkWatcherAgentExtension 'extensions/main.bicep' = if (extension } } -module vmss_desiredStateConfigurationExtension 'extensions/main.bicep' = if (extensionDSCConfig.enabled) { +module vmss_desiredStateConfigurationExtension 'extension/main.bicep' = if (extensionDSCConfig.enabled) { name: '${uniqueString(deployment().name, location)}-VMSS-DesiredStateConfiguration' params: { virtualMachineScaleSetName: vmss.name @@ -576,7 +576,7 @@ module vmss_desiredStateConfigurationExtension 'extensions/main.bicep' = if (ext } } -module vmss_customScriptExtension 'extensions/main.bicep' = if (extensionCustomScriptConfig.enabled) { +module vmss_customScriptExtension 'extension/main.bicep' = if (extensionCustomScriptConfig.enabled) { name: '${uniqueString(deployment().name, location)}-VMSS-CustomScriptExtension' params: { virtualMachineScaleSetName: vmss.name @@ -597,7 +597,7 @@ module vmss_customScriptExtension 'extensions/main.bicep' = if (extensionCustomS ] } -module vmss_azureDiskEncryptionExtension 'extensions/main.bicep' = if (extensionAzureDiskEncryptionConfig.enabled) { +module vmss_azureDiskEncryptionExtension 'extension/main.bicep' = if (extensionAzureDiskEncryptionConfig.enabled) { name: '${uniqueString(deployment().name, location)}-VMSS-AzureDiskEncryption' params: { virtualMachineScaleSetName: vmss.name diff --git a/modules/compute/virtual-machine-scale-sets/main.json b/modules/compute/virtual-machine-scale-set/main.json similarity index 100% rename from modules/compute/virtual-machine-scale-sets/main.json rename to modules/compute/virtual-machine-scale-set/main.json diff --git a/modules/compute/virtual-machine-scale-sets/version.json b/modules/compute/virtual-machine-scale-set/version.json similarity index 100% rename from modules/compute/virtual-machine-scale-sets/version.json rename to modules/compute/virtual-machine-scale-set/version.json diff --git a/modules/compute/virtual-machines/.bicep/nested_networkInterface.bicep b/modules/compute/virtual-machine/.bicep/nested_networkInterface.bicep similarity index 96% rename from modules/compute/virtual-machines/.bicep/nested_networkInterface.bicep rename to modules/compute/virtual-machine/.bicep/nested_networkInterface.bicep index 61ee6dc90c..a89602200b 100644 --- a/modules/compute/virtual-machines/.bicep/nested_networkInterface.bicep +++ b/modules/compute/virtual-machine/.bicep/nested_networkInterface.bicep @@ -31,7 +31,7 @@ param nicDiagnosticSettingsName string = '${virtualMachineName}-diagnosticSettin var enableReferencedModulesTelemetry = false -module networkInterface_publicIPAddresses '../../../network/public-ip-addresses/main.bicep' = [for (ipConfiguration, index) in ipConfigurations: if (contains(ipConfiguration, 'pipconfiguration')) { +module networkInterface_publicIPAddresses '../../../network/public-ip-address/main.bicep' = [for (ipConfiguration, index) in ipConfigurations: if (contains(ipConfiguration, 'pipconfiguration')) { name: '${deployment().name}-publicIP-${index}' params: { name: '${virtualMachineName}${ipConfiguration.pipconfiguration.publicIpNameSuffix}' @@ -57,7 +57,7 @@ module networkInterface_publicIPAddresses '../../../network/public-ip-addresses/ } }] -module networkInterface '../../../network/network-interfaces/main.bicep' = { +module networkInterface '../../../network/network-interface/main.bicep' = { name: '${deployment().name}-NetworkInterface' params: { name: networkInterfaceName diff --git a/modules/compute/virtual-machines/.bicep/nested_roleAssignments.bicep b/modules/compute/virtual-machine/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/compute/virtual-machines/.bicep/nested_roleAssignments.bicep rename to modules/compute/virtual-machine/.bicep/nested_roleAssignments.bicep diff --git a/modules/compute/virtual-machines/.test/linux.atmg/dependencies.bicep b/modules/compute/virtual-machine/.test/linux.atmg/dependencies.bicep similarity index 100% rename from modules/compute/virtual-machines/.test/linux.atmg/dependencies.bicep rename to modules/compute/virtual-machine/.test/linux.atmg/dependencies.bicep diff --git a/modules/compute/virtual-machines/.test/linux.atmg/main.test.bicep b/modules/compute/virtual-machine/.test/linux.atmg/main.test.bicep similarity index 100% rename from modules/compute/virtual-machines/.test/linux.atmg/main.test.bicep rename to modules/compute/virtual-machine/.test/linux.atmg/main.test.bicep diff --git a/modules/compute/virtual-machines/.test/linux.min/dependencies.bicep b/modules/compute/virtual-machine/.test/linux.min/dependencies.bicep similarity index 100% rename from modules/compute/virtual-machines/.test/linux.min/dependencies.bicep rename to modules/compute/virtual-machine/.test/linux.min/dependencies.bicep diff --git a/modules/compute/virtual-machines/.test/linux.min/main.test.bicep b/modules/compute/virtual-machine/.test/linux.min/main.test.bicep similarity index 100% rename from modules/compute/virtual-machines/.test/linux.min/main.test.bicep rename to modules/compute/virtual-machine/.test/linux.min/main.test.bicep diff --git a/modules/compute/virtual-machines/.test/linux/dependencies.bicep b/modules/compute/virtual-machine/.test/linux/dependencies.bicep similarity index 100% rename from modules/compute/virtual-machines/.test/linux/dependencies.bicep rename to modules/compute/virtual-machine/.test/linux/dependencies.bicep diff --git a/modules/compute/virtual-machines/.test/linux/main.test.bicep b/modules/compute/virtual-machine/.test/linux/main.test.bicep similarity index 100% rename from modules/compute/virtual-machines/.test/linux/main.test.bicep rename to modules/compute/virtual-machine/.test/linux/main.test.bicep diff --git a/modules/compute/virtual-machines/.test/main.test.bicep b/modules/compute/virtual-machine/.test/main.test.bicep similarity index 100% rename from modules/compute/virtual-machines/.test/main.test.bicep rename to modules/compute/virtual-machine/.test/main.test.bicep diff --git a/modules/compute/virtual-machines/.test/windows.atmg/dependencies.bicep b/modules/compute/virtual-machine/.test/windows.atmg/dependencies.bicep similarity index 100% rename from modules/compute/virtual-machines/.test/windows.atmg/dependencies.bicep rename to modules/compute/virtual-machine/.test/windows.atmg/dependencies.bicep diff --git a/modules/compute/virtual-machines/.test/windows.atmg/main.test.bicep b/modules/compute/virtual-machine/.test/windows.atmg/main.test.bicep similarity index 100% rename from modules/compute/virtual-machines/.test/windows.atmg/main.test.bicep rename to modules/compute/virtual-machine/.test/windows.atmg/main.test.bicep diff --git a/modules/compute/virtual-machines/.test/windows.min/dependencies.bicep b/modules/compute/virtual-machine/.test/windows.min/dependencies.bicep similarity index 100% rename from modules/compute/virtual-machines/.test/windows.min/dependencies.bicep rename to modules/compute/virtual-machine/.test/windows.min/dependencies.bicep diff --git a/modules/compute/virtual-machines/.test/windows.min/main.test.bicep b/modules/compute/virtual-machine/.test/windows.min/main.test.bicep similarity index 100% rename from modules/compute/virtual-machines/.test/windows.min/main.test.bicep rename to modules/compute/virtual-machine/.test/windows.min/main.test.bicep diff --git a/modules/compute/virtual-machines/.test/windows.ssecmk/dependencies.bicep b/modules/compute/virtual-machine/.test/windows.ssecmk/dependencies.bicep similarity index 100% rename from modules/compute/virtual-machines/.test/windows.ssecmk/dependencies.bicep rename to modules/compute/virtual-machine/.test/windows.ssecmk/dependencies.bicep diff --git a/modules/compute/virtual-machines/.test/windows.ssecmk/main.test.bicep b/modules/compute/virtual-machine/.test/windows.ssecmk/main.test.bicep similarity index 100% rename from modules/compute/virtual-machines/.test/windows.ssecmk/main.test.bicep rename to modules/compute/virtual-machine/.test/windows.ssecmk/main.test.bicep diff --git a/modules/compute/virtual-machines/.test/windows/dependencies.bicep b/modules/compute/virtual-machine/.test/windows/dependencies.bicep similarity index 100% rename from modules/compute/virtual-machines/.test/windows/dependencies.bicep rename to modules/compute/virtual-machine/.test/windows/dependencies.bicep diff --git a/modules/compute/virtual-machines/.test/windows/main.test.bicep b/modules/compute/virtual-machine/.test/windows/main.test.bicep similarity index 100% rename from modules/compute/virtual-machines/.test/windows/main.test.bicep rename to modules/compute/virtual-machine/.test/windows/main.test.bicep diff --git a/modules/compute/virtual-machines/README.md b/modules/compute/virtual-machine/README.md similarity index 99% rename from modules/compute/virtual-machines/README.md rename to modules/compute/virtual-machine/README.md index 2dac052b96..0e4a9982cd 100644 --- a/modules/compute/virtual-machines/README.md +++ b/modules/compute/virtual-machine/README.md @@ -1042,7 +1042,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module virtualMachines './compute/virtual-machines/main.bicep' = { +module virtualMachines './compute/virtual-machine/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cvmlincom' params: { // Required parameters @@ -1539,7 +1539,7 @@ module virtualMachines './compute/virtual-machines/main.bicep' = { via Bicep module ```bicep -module virtualMachines './compute/virtual-machines/main.bicep' = { +module virtualMachines './compute/virtual-machine/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cvmlinatmg' params: { // Required parameters @@ -1706,7 +1706,7 @@ module virtualMachines './compute/virtual-machines/main.bicep' = { via Bicep module ```bicep -module virtualMachines './compute/virtual-machines/main.bicep' = { +module virtualMachines './compute/virtual-machine/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cvmlinmin' params: { // Required parameters @@ -1843,7 +1843,7 @@ module virtualMachines './compute/virtual-machines/main.bicep' = { via Bicep module ```bicep -module virtualMachines './compute/virtual-machines/main.bicep' = { +module virtualMachines './compute/virtual-machine/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cvmwincom' params: { // Required parameters @@ -2376,7 +2376,7 @@ module virtualMachines './compute/virtual-machines/main.bicep' = { via Bicep module ```bicep -module virtualMachines './compute/virtual-machines/main.bicep' = { +module virtualMachines './compute/virtual-machine/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cvmwinatmg' params: { // Required parameters @@ -2507,7 +2507,7 @@ module virtualMachines './compute/virtual-machines/main.bicep' = { via Bicep module ```bicep -module virtualMachines './compute/virtual-machines/main.bicep' = { +module virtualMachines './compute/virtual-machine/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cvmwinmin' params: { // Required parameters @@ -2624,7 +2624,7 @@ module virtualMachines './compute/virtual-machines/main.bicep' = { via Bicep module ```bicep -module virtualMachines './compute/virtual-machines/main.bicep' = { +module virtualMachines './compute/virtual-machine/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cvmwincmk' params: { // Required parameters diff --git a/modules/compute/virtual-machines/extensions/README.md b/modules/compute/virtual-machine/extensions/README.md similarity index 100% rename from modules/compute/virtual-machines/extensions/README.md rename to modules/compute/virtual-machine/extensions/README.md diff --git a/modules/compute/virtual-machines/extensions/main.bicep b/modules/compute/virtual-machine/extensions/main.bicep similarity index 100% rename from modules/compute/virtual-machines/extensions/main.bicep rename to modules/compute/virtual-machine/extensions/main.bicep diff --git a/modules/compute/virtual-machines/extensions/main.json b/modules/compute/virtual-machine/extensions/main.json similarity index 100% rename from modules/compute/virtual-machines/extensions/main.json rename to modules/compute/virtual-machine/extensions/main.json diff --git a/modules/compute/virtual-machines/extensions/version.json b/modules/compute/virtual-machine/extensions/version.json similarity index 100% rename from modules/compute/virtual-machines/extensions/version.json rename to modules/compute/virtual-machine/extensions/version.json diff --git a/modules/compute/virtual-machines/main.bicep b/modules/compute/virtual-machine/main.bicep similarity index 97% rename from modules/compute/virtual-machines/main.bicep rename to modules/compute/virtual-machine/main.bicep index b2fd336b3a..009cb6ecbd 100644 --- a/modules/compute/virtual-machines/main.bicep +++ b/modules/compute/virtual-machine/main.bicep @@ -518,7 +518,7 @@ resource vm_configurationProfileAssignment 'Microsoft.Automanage/configurationPr scope: vm } -module vm_aadJoinExtension 'extensions/main.bicep' = if (extensionAadJoinConfig.enabled) { +module vm_aadJoinExtension 'extension/main.bicep' = if (extensionAadJoinConfig.enabled) { name: '${uniqueString(deployment().name, location)}-VM-AADLogin' params: { virtualMachineName: vm.name @@ -533,7 +533,7 @@ module vm_aadJoinExtension 'extensions/main.bicep' = if (extensionAadJoinConfig. } } -module vm_domainJoinExtension 'extensions/main.bicep' = if (extensionDomainJoinConfig.enabled) { +module vm_domainJoinExtension 'extension/main.bicep' = if (extensionDomainJoinConfig.enabled) { name: '${uniqueString(deployment().name, location)}-VM-DomainJoin' params: { virtualMachineName: vm.name @@ -552,7 +552,7 @@ module vm_domainJoinExtension 'extensions/main.bicep' = if (extensionDomainJoinC } } -module vm_microsoftAntiMalwareExtension 'extensions/main.bicep' = if (extensionAntiMalwareConfig.enabled) { +module vm_microsoftAntiMalwareExtension 'extension/main.bicep' = if (extensionAntiMalwareConfig.enabled) { name: '${uniqueString(deployment().name, location)}-VM-MicrosoftAntiMalware' params: { virtualMachineName: vm.name @@ -573,7 +573,7 @@ resource vm_logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2021 scope: az.resourceGroup(split(monitoringWorkspaceId, '/')[2], split(monitoringWorkspaceId, '/')[4]) } -module vm_microsoftMonitoringAgentExtension 'extensions/main.bicep' = if (extensionMonitoringAgentConfig.enabled) { +module vm_microsoftMonitoringAgentExtension 'extension/main.bicep' = if (extensionMonitoringAgentConfig.enabled) { name: '${uniqueString(deployment().name, location)}-VM-MicrosoftMonitoringAgent' params: { virtualMachineName: vm.name @@ -594,7 +594,7 @@ module vm_microsoftMonitoringAgentExtension 'extensions/main.bicep' = if (extens } } -module vm_dependencyAgentExtension 'extensions/main.bicep' = if (extensionDependencyAgentConfig.enabled) { +module vm_dependencyAgentExtension 'extension/main.bicep' = if (extensionDependencyAgentConfig.enabled) { name: '${uniqueString(deployment().name, location)}-VM-DependencyAgent' params: { virtualMachineName: vm.name @@ -609,7 +609,7 @@ module vm_dependencyAgentExtension 'extensions/main.bicep' = if (extensionDepend } } -module vm_networkWatcherAgentExtension 'extensions/main.bicep' = if (extensionNetworkWatcherAgentConfig.enabled) { +module vm_networkWatcherAgentExtension 'extension/main.bicep' = if (extensionNetworkWatcherAgentConfig.enabled) { name: '${uniqueString(deployment().name, location)}-VM-NetworkWatcherAgent' params: { virtualMachineName: vm.name @@ -624,7 +624,7 @@ module vm_networkWatcherAgentExtension 'extensions/main.bicep' = if (extensionNe } } -module vm_desiredStateConfigurationExtension 'extensions/main.bicep' = if (extensionDSCConfig.enabled) { +module vm_desiredStateConfigurationExtension 'extension/main.bicep' = if (extensionDSCConfig.enabled) { name: '${uniqueString(deployment().name, location)}-VM-DesiredStateConfiguration' params: { virtualMachineName: vm.name @@ -641,7 +641,7 @@ module vm_desiredStateConfigurationExtension 'extensions/main.bicep' = if (exten } } -module vm_customScriptExtension 'extensions/main.bicep' = if (extensionCustomScriptConfig.enabled) { +module vm_customScriptExtension 'extension/main.bicep' = if (extensionCustomScriptConfig.enabled) { name: '${uniqueString(deployment().name, location)}-VM-CustomScriptExtension' params: { virtualMachineName: vm.name @@ -663,7 +663,7 @@ module vm_customScriptExtension 'extensions/main.bicep' = if (extensionCustomScr ] } -module vm_azureDiskEncryptionExtension 'extensions/main.bicep' = if (extensionAzureDiskEncryptionConfig.enabled) { +module vm_azureDiskEncryptionExtension 'extension/main.bicep' = if (extensionAzureDiskEncryptionConfig.enabled) { name: '${uniqueString(deployment().name, location)}-VM-AzureDiskEncryption' params: { virtualMachineName: vm.name @@ -684,7 +684,7 @@ module vm_azureDiskEncryptionExtension 'extensions/main.bicep' = if (extensionAz ] } -module vm_backup '../../recovery-services/vaults/backup-fabrics/protection-containers/protected-items/main.bicep' = if (!empty(backupVaultName)) { +module vm_backup '../../recovery-services/vault/backup-fabrics/protection-container/protected-item/main.bicep' = if (!empty(backupVaultName)) { name: '${uniqueString(deployment().name, location)}-VM-Backup' params: { name: 'vm;iaasvmcontainerv2;${resourceGroup().name};${vm.name}' diff --git a/modules/compute/virtual-machines/main.json b/modules/compute/virtual-machine/main.json similarity index 100% rename from modules/compute/virtual-machines/main.json rename to modules/compute/virtual-machine/main.json diff --git a/modules/compute/virtual-machines/version.json b/modules/compute/virtual-machine/version.json similarity index 100% rename from modules/compute/virtual-machines/version.json rename to modules/compute/virtual-machine/version.json diff --git a/modules/consumption/budgets/.test/common/main.test.bicep b/modules/consumption/budget/.test/common/main.test.bicep similarity index 100% rename from modules/consumption/budgets/.test/common/main.test.bicep rename to modules/consumption/budget/.test/common/main.test.bicep diff --git a/modules/consumption/budgets/.test/main.test.bicep b/modules/consumption/budget/.test/main.test.bicep similarity index 100% rename from modules/consumption/budgets/.test/main.test.bicep rename to modules/consumption/budget/.test/main.test.bicep diff --git a/modules/consumption/budgets/.test/min/main.test.bicep b/modules/consumption/budget/.test/min/main.test.bicep similarity index 100% rename from modules/consumption/budgets/.test/min/main.test.bicep rename to modules/consumption/budget/.test/min/main.test.bicep diff --git a/modules/consumption/budgets/README.md b/modules/consumption/budget/README.md similarity index 98% rename from modules/consumption/budgets/README.md rename to modules/consumption/budget/README.md index 93737ba432..9b2127ef05 100644 --- a/modules/consumption/budgets/README.md +++ b/modules/consumption/budget/README.md @@ -72,7 +72,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module budgets './consumption/budgets/main.bicep' = { +module budgets './consumption/budget/main.bicep' = { name: '${uniqueString(deployment().name)}-test-cbcom' params: { // Required parameters @@ -145,7 +145,7 @@ module budgets './consumption/budgets/main.bicep' = { via Bicep module ```bicep -module budgets './consumption/budgets/main.bicep' = { +module budgets './consumption/budget/main.bicep' = { name: '${uniqueString(deployment().name)}-test-cbmin' params: { // Required parameters diff --git a/modules/consumption/budgets/main.bicep b/modules/consumption/budget/main.bicep similarity index 100% rename from modules/consumption/budgets/main.bicep rename to modules/consumption/budget/main.bicep diff --git a/modules/consumption/budgets/main.json b/modules/consumption/budget/main.json similarity index 100% rename from modules/consumption/budgets/main.json rename to modules/consumption/budget/main.json diff --git a/modules/consumption/budgets/version.json b/modules/consumption/budget/version.json similarity index 100% rename from modules/consumption/budgets/version.json rename to modules/consumption/budget/version.json diff --git a/modules/container-instance/container-groups/.test/common/dependencies.bicep b/modules/container-instance/container-group/.test/common/dependencies.bicep similarity index 100% rename from modules/container-instance/container-groups/.test/common/dependencies.bicep rename to modules/container-instance/container-group/.test/common/dependencies.bicep diff --git a/modules/container-instance/container-groups/.test/common/main.test.bicep b/modules/container-instance/container-group/.test/common/main.test.bicep similarity index 100% rename from modules/container-instance/container-groups/.test/common/main.test.bicep rename to modules/container-instance/container-group/.test/common/main.test.bicep diff --git a/modules/container-instance/container-groups/.test/encr/dependencies.bicep b/modules/container-instance/container-group/.test/encr/dependencies.bicep similarity index 100% rename from modules/container-instance/container-groups/.test/encr/dependencies.bicep rename to modules/container-instance/container-group/.test/encr/dependencies.bicep diff --git a/modules/container-instance/container-groups/.test/encr/main.test.bicep b/modules/container-instance/container-group/.test/encr/main.test.bicep similarity index 100% rename from modules/container-instance/container-groups/.test/encr/main.test.bicep rename to modules/container-instance/container-group/.test/encr/main.test.bicep diff --git a/modules/container-instance/container-groups/.test/main.test.bicep b/modules/container-instance/container-group/.test/main.test.bicep similarity index 100% rename from modules/container-instance/container-groups/.test/main.test.bicep rename to modules/container-instance/container-group/.test/main.test.bicep diff --git a/modules/container-instance/container-groups/.test/min/main.test.bicep b/modules/container-instance/container-group/.test/min/main.test.bicep similarity index 100% rename from modules/container-instance/container-groups/.test/min/main.test.bicep rename to modules/container-instance/container-group/.test/min/main.test.bicep diff --git a/modules/container-instance/container-groups/.test/private/dependencies.bicep b/modules/container-instance/container-group/.test/private/dependencies.bicep similarity index 100% rename from modules/container-instance/container-groups/.test/private/dependencies.bicep rename to modules/container-instance/container-group/.test/private/dependencies.bicep diff --git a/modules/container-instance/container-groups/.test/private/main.test.bicep b/modules/container-instance/container-group/.test/private/main.test.bicep similarity index 100% rename from modules/container-instance/container-groups/.test/private/main.test.bicep rename to modules/container-instance/container-group/.test/private/main.test.bicep diff --git a/modules/container-instance/container-groups/README.md b/modules/container-instance/container-group/README.md similarity index 98% rename from modules/container-instance/container-groups/README.md rename to modules/container-instance/container-group/README.md index 5e96b19be0..ccccaacb43 100644 --- a/modules/container-instance/container-groups/README.md +++ b/modules/container-instance/container-group/README.md @@ -308,7 +308,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module containerGroups './container-instance/container-groups/main.bicep' = { +module containerGroups './container-instance/container-group/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cicgcom' params: { // Required parameters @@ -495,7 +495,7 @@ module containerGroups './container-instance/container-groups/main.bicep' = { via Bicep module ```bicep -module containerGroups './container-instance/container-groups/main.bicep' = { +module containerGroups './container-instance/container-group/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cicgenc' params: { // Required parameters @@ -694,7 +694,7 @@ module containerGroups './container-instance/container-groups/main.bicep' = { via Bicep module ```bicep -module containerGroups './container-instance/container-groups/main.bicep' = { +module containerGroups './container-instance/container-group/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cicgmin' params: { // Required parameters @@ -795,7 +795,7 @@ module containerGroups './container-instance/container-groups/main.bicep' = { via Bicep module ```bicep -module containerGroups './container-instance/container-groups/main.bicep' = { +module containerGroups './container-instance/container-group/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-cicgprivate' params: { // Required parameters diff --git a/modules/container-instance/container-groups/main.bicep b/modules/container-instance/container-group/main.bicep similarity index 100% rename from modules/container-instance/container-groups/main.bicep rename to modules/container-instance/container-group/main.bicep diff --git a/modules/container-instance/container-groups/main.json b/modules/container-instance/container-group/main.json similarity index 100% rename from modules/container-instance/container-groups/main.json rename to modules/container-instance/container-group/main.json diff --git a/modules/container-instance/container-groups/version.json b/modules/container-instance/container-group/version.json similarity index 100% rename from modules/container-instance/container-groups/version.json rename to modules/container-instance/container-group/version.json diff --git a/modules/container-registry/registries/.bicep/nested_roleAssignments.bicep b/modules/container-registry/registry/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/container-registry/registries/.bicep/nested_roleAssignments.bicep rename to modules/container-registry/registry/.bicep/nested_roleAssignments.bicep diff --git a/modules/container-registry/registries/.test/common/dependencies.bicep b/modules/container-registry/registry/.test/common/dependencies.bicep similarity index 100% rename from modules/container-registry/registries/.test/common/dependencies.bicep rename to modules/container-registry/registry/.test/common/dependencies.bicep diff --git a/modules/container-registry/registries/.test/common/main.test.bicep b/modules/container-registry/registry/.test/common/main.test.bicep similarity index 100% rename from modules/container-registry/registries/.test/common/main.test.bicep rename to modules/container-registry/registry/.test/common/main.test.bicep diff --git a/modules/container-registry/registries/.test/encr/dependencies.bicep b/modules/container-registry/registry/.test/encr/dependencies.bicep similarity index 100% rename from modules/container-registry/registries/.test/encr/dependencies.bicep rename to modules/container-registry/registry/.test/encr/dependencies.bicep diff --git a/modules/container-registry/registries/.test/encr/main.test.bicep b/modules/container-registry/registry/.test/encr/main.test.bicep similarity index 100% rename from modules/container-registry/registries/.test/encr/main.test.bicep rename to modules/container-registry/registry/.test/encr/main.test.bicep diff --git a/modules/container-registry/registries/.test/main.test.bicep b/modules/container-registry/registry/.test/main.test.bicep similarity index 100% rename from modules/container-registry/registries/.test/main.test.bicep rename to modules/container-registry/registry/.test/main.test.bicep diff --git a/modules/container-registry/registries/.test/min/main.test.bicep b/modules/container-registry/registry/.test/min/main.test.bicep similarity index 100% rename from modules/container-registry/registries/.test/min/main.test.bicep rename to modules/container-registry/registry/.test/min/main.test.bicep diff --git a/modules/container-registry/registries/.test/pe/dependencies.bicep b/modules/container-registry/registry/.test/pe/dependencies.bicep similarity index 100% rename from modules/container-registry/registries/.test/pe/dependencies.bicep rename to modules/container-registry/registry/.test/pe/dependencies.bicep diff --git a/modules/container-registry/registries/.test/pe/main.test.bicep b/modules/container-registry/registry/.test/pe/main.test.bicep similarity index 100% rename from modules/container-registry/registries/.test/pe/main.test.bicep rename to modules/container-registry/registry/.test/pe/main.test.bicep diff --git a/modules/container-registry/registries/README.md b/modules/container-registry/registry/README.md similarity index 99% rename from modules/container-registry/registries/README.md rename to modules/container-registry/registry/README.md index 2a45e31f1f..55a3aca8ba 100644 --- a/modules/container-registry/registries/README.md +++ b/modules/container-registry/registry/README.md @@ -382,7 +382,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module registries './container-registry/registries/main.bicep' = { +module registries './container-registry/registry/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-crrcom' params: { // Required parameters @@ -599,7 +599,7 @@ module registries './container-registry/registries/main.bicep' = { via Bicep module ```bicep -module registries './container-registry/registries/main.bicep' = { +module registries './container-registry/registry/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-crrencr' params: { // Required parameters @@ -682,7 +682,7 @@ module registries './container-registry/registries/main.bicep' = { via Bicep module ```bicep -module registries './container-registry/registries/main.bicep' = { +module registries './container-registry/registry/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-crrmin' params: { // Required parameters @@ -727,7 +727,7 @@ module registries './container-registry/registries/main.bicep' = { via Bicep module ```bicep -module registries './container-registry/registries/main.bicep' = { +module registries './container-registry/registry/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-crrpe' params: { // Required parameters diff --git a/modules/container-registry/registries/main.bicep b/modules/container-registry/registry/main.bicep similarity index 98% rename from modules/container-registry/registries/main.bicep rename to modules/container-registry/registry/main.bicep index c67faefe31..68f470fdf9 100644 --- a/modules/container-registry/registries/main.bicep +++ b/modules/container-registry/registry/main.bicep @@ -303,7 +303,7 @@ resource registry 'Microsoft.ContainerRegistry/registries@2022-02-01-preview' = } } -module registry_replications 'replications/main.bicep' = [for (replication, index) in replications: { +module registry_replications 'replication/main.bicep' = [for (replication, index) in replications: { name: '${uniqueString(deployment().name, location)}-Registry-Replication-${index}' params: { name: replication.name @@ -316,7 +316,7 @@ module registry_replications 'replications/main.bicep' = [for (replication, inde } }] -module registry_webhooks 'webhooks/main.bicep' = [for (webhook, index) in webhooks: { +module registry_webhooks 'webhook/main.bicep' = [for (webhook, index) in webhooks: { name: '${uniqueString(deployment().name, location)}-Registry-Webhook-${index}' params: { name: webhook.name @@ -372,7 +372,7 @@ module registry_roleAssignments '.bicep/nested_roleAssignments.bicep' = [for (ro } }] -module registry_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module registry_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-ContainerRegistry-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/container-registry/registries/main.json b/modules/container-registry/registry/main.json similarity index 100% rename from modules/container-registry/registries/main.json rename to modules/container-registry/registry/main.json diff --git a/modules/container-registry/registries/replications/README.md b/modules/container-registry/registry/replications/README.md similarity index 100% rename from modules/container-registry/registries/replications/README.md rename to modules/container-registry/registry/replications/README.md diff --git a/modules/container-registry/registries/replications/main.bicep b/modules/container-registry/registry/replications/main.bicep similarity index 100% rename from modules/container-registry/registries/replications/main.bicep rename to modules/container-registry/registry/replications/main.bicep diff --git a/modules/container-registry/registries/replications/main.json b/modules/container-registry/registry/replications/main.json similarity index 100% rename from modules/container-registry/registries/replications/main.json rename to modules/container-registry/registry/replications/main.json diff --git a/modules/container-registry/registries/replications/version.json b/modules/container-registry/registry/replications/version.json similarity index 100% rename from modules/container-registry/registries/replications/version.json rename to modules/container-registry/registry/replications/version.json diff --git a/modules/container-registry/registries/version.json b/modules/container-registry/registry/version.json similarity index 100% rename from modules/container-registry/registries/version.json rename to modules/container-registry/registry/version.json diff --git a/modules/container-registry/registries/webhooks/README.md b/modules/container-registry/registry/webhooks/README.md similarity index 100% rename from modules/container-registry/registries/webhooks/README.md rename to modules/container-registry/registry/webhooks/README.md diff --git a/modules/container-registry/registries/webhooks/main.bicep b/modules/container-registry/registry/webhooks/main.bicep similarity index 100% rename from modules/container-registry/registries/webhooks/main.bicep rename to modules/container-registry/registry/webhooks/main.bicep diff --git a/modules/container-registry/registries/webhooks/main.json b/modules/container-registry/registry/webhooks/main.json similarity index 100% rename from modules/container-registry/registries/webhooks/main.json rename to modules/container-registry/registry/webhooks/main.json diff --git a/modules/container-registry/registries/webhooks/version.json b/modules/container-registry/registry/webhooks/version.json similarity index 100% rename from modules/container-registry/registries/webhooks/version.json rename to modules/container-registry/registry/webhooks/version.json diff --git a/modules/container-service/managed-clusters/.bicep/nested_roleAssignments.bicep b/modules/container-service/managed-cluster/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/container-service/managed-clusters/.bicep/nested_roleAssignments.bicep rename to modules/container-service/managed-cluster/.bicep/nested_roleAssignments.bicep diff --git a/modules/container-service/managed-clusters/.test/azure/dependencies.bicep b/modules/container-service/managed-cluster/.test/azure/dependencies.bicep similarity index 100% rename from modules/container-service/managed-clusters/.test/azure/dependencies.bicep rename to modules/container-service/managed-cluster/.test/azure/dependencies.bicep diff --git a/modules/container-service/managed-clusters/.test/azure/main.test.bicep b/modules/container-service/managed-cluster/.test/azure/main.test.bicep similarity index 100% rename from modules/container-service/managed-clusters/.test/azure/main.test.bicep rename to modules/container-service/managed-cluster/.test/azure/main.test.bicep diff --git a/modules/container-service/managed-clusters/.test/kubenet/dependencies.bicep b/modules/container-service/managed-cluster/.test/kubenet/dependencies.bicep similarity index 100% rename from modules/container-service/managed-clusters/.test/kubenet/dependencies.bicep rename to modules/container-service/managed-cluster/.test/kubenet/dependencies.bicep diff --git a/modules/container-service/managed-clusters/.test/kubenet/main.test.bicep b/modules/container-service/managed-cluster/.test/kubenet/main.test.bicep similarity index 100% rename from modules/container-service/managed-clusters/.test/kubenet/main.test.bicep rename to modules/container-service/managed-cluster/.test/kubenet/main.test.bicep diff --git a/modules/container-service/managed-clusters/.test/main.test.bicep b/modules/container-service/managed-cluster/.test/main.test.bicep similarity index 100% rename from modules/container-service/managed-clusters/.test/main.test.bicep rename to modules/container-service/managed-cluster/.test/main.test.bicep diff --git a/modules/container-service/managed-clusters/.test/min/main.test.bicep b/modules/container-service/managed-cluster/.test/min/main.test.bicep similarity index 100% rename from modules/container-service/managed-clusters/.test/min/main.test.bicep rename to modules/container-service/managed-cluster/.test/min/main.test.bicep diff --git a/modules/container-service/managed-clusters/.test/priv/dependencies.bicep b/modules/container-service/managed-cluster/.test/priv/dependencies.bicep similarity index 100% rename from modules/container-service/managed-clusters/.test/priv/dependencies.bicep rename to modules/container-service/managed-cluster/.test/priv/dependencies.bicep diff --git a/modules/container-service/managed-clusters/.test/priv/main.test.bicep b/modules/container-service/managed-cluster/.test/priv/main.test.bicep similarity index 100% rename from modules/container-service/managed-clusters/.test/priv/main.test.bicep rename to modules/container-service/managed-cluster/.test/priv/main.test.bicep diff --git a/modules/container-service/managed-clusters/README.md b/modules/container-service/managed-cluster/README.md similarity index 99% rename from modules/container-service/managed-clusters/README.md rename to modules/container-service/managed-cluster/README.md index c2a8966fb4..c9314a34f8 100644 --- a/modules/container-service/managed-clusters/README.md +++ b/modules/container-service/managed-cluster/README.md @@ -393,7 +393,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module managedClusters './container-service/managed-clusters/main.bicep' = { +module managedClusters './container-service/managed-cluster/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-csmaz' params: { // Required parameters @@ -774,7 +774,7 @@ module managedClusters './container-service/managed-clusters/main.bicep' = { via Bicep module ```bicep -module managedClusters './container-service/managed-clusters/main.bicep' = { +module managedClusters './container-service/managed-cluster/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-csmkube' params: { // Required parameters @@ -1025,7 +1025,7 @@ module managedClusters './container-service/managed-clusters/main.bicep' = { via Bicep module ```bicep -module managedClusters './container-service/managed-clusters/main.bicep' = { +module managedClusters './container-service/managed-cluster/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-csmmin' params: { // Required parameters @@ -1092,7 +1092,7 @@ module managedClusters './container-service/managed-clusters/main.bicep' = { via Bicep module ```bicep -module managedClusters './container-service/managed-clusters/main.bicep' = { +module managedClusters './container-service/managed-cluster/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-csmpriv' params: { // Required parameters diff --git a/modules/container-service/managed-clusters/agent-pools/README.md b/modules/container-service/managed-cluster/agent-pools/README.md similarity index 100% rename from modules/container-service/managed-clusters/agent-pools/README.md rename to modules/container-service/managed-cluster/agent-pools/README.md diff --git a/modules/container-service/managed-clusters/agent-pools/main.bicep b/modules/container-service/managed-cluster/agent-pools/main.bicep similarity index 100% rename from modules/container-service/managed-clusters/agent-pools/main.bicep rename to modules/container-service/managed-cluster/agent-pools/main.bicep diff --git a/modules/container-service/managed-clusters/agent-pools/main.json b/modules/container-service/managed-cluster/agent-pools/main.json similarity index 100% rename from modules/container-service/managed-clusters/agent-pools/main.json rename to modules/container-service/managed-cluster/agent-pools/main.json diff --git a/modules/container-service/managed-clusters/agent-pools/version.json b/modules/container-service/managed-cluster/agent-pools/version.json similarity index 100% rename from modules/container-service/managed-clusters/agent-pools/version.json rename to modules/container-service/managed-cluster/agent-pools/version.json diff --git a/modules/container-service/managed-clusters/main.bicep b/modules/container-service/managed-cluster/main.bicep similarity index 99% rename from modules/container-service/managed-clusters/main.bicep rename to modules/container-service/managed-cluster/main.bicep index d833bf6c55..7a0abfa63f 100644 --- a/modules/container-service/managed-clusters/main.bicep +++ b/modules/container-service/managed-cluster/main.bicep @@ -541,7 +541,7 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2023-05-02-p } } -module managedCluster_agentPools 'agent-pools/main.bicep' = [for (agentPool, index) in agentPools: { +module managedCluster_agentPools 'agent-pool/main.bicep' = [for (agentPool, index) in agentPools: { name: '${uniqueString(deployment().name, location)}-ManagedCluster-AgentPool-${index}' params: { managedClusterName: managedCluster.name @@ -584,7 +584,7 @@ module managedCluster_agentPools 'agent-pools/main.bicep' = [for (agentPool, ind } }] -module managedCluster_extension '../../kubernetes-configuration/extensions/main.bicep' = if (!empty(fluxExtension)) { +module managedCluster_extension '../../kubernetes-configuration/extension/main.bicep' = if (!empty(fluxExtension)) { name: '${uniqueString(deployment().name, location)}-ManagedCluster-FluxExtension' params: { clusterName: managedCluster.name diff --git a/modules/container-service/managed-clusters/main.json b/modules/container-service/managed-cluster/main.json similarity index 100% rename from modules/container-service/managed-clusters/main.json rename to modules/container-service/managed-cluster/main.json diff --git a/modules/container-service/managed-clusters/version.json b/modules/container-service/managed-cluster/version.json similarity index 100% rename from modules/container-service/managed-clusters/version.json rename to modules/container-service/managed-cluster/version.json diff --git a/modules/data-factory/factories/README.md b/modules/data-factory/factories/README.md index b937a2edbd..6651e101c5 100644 --- a/modules/data-factory/factories/README.md +++ b/modules/data-factory/factories/README.md @@ -392,7 +392,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module factories './data-factory/factories/main.bicep' = { +module factories './data-factory/factory/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dffcom' params: { // Required parameters @@ -623,7 +623,7 @@ module factories './data-factory/factories/main.bicep' = { via Bicep module ```bicep -module factories './data-factory/factories/main.bicep' = { +module factories './data-factory/factory/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dffmin' params: { // Required parameters diff --git a/modules/data-factory/factories/integration-runtimes/README.md b/modules/data-factory/factories/integration-runtime/README.md similarity index 100% rename from modules/data-factory/factories/integration-runtimes/README.md rename to modules/data-factory/factories/integration-runtime/README.md diff --git a/modules/data-factory/factories/integration-runtimes/main.bicep b/modules/data-factory/factories/integration-runtime/main.bicep similarity index 100% rename from modules/data-factory/factories/integration-runtimes/main.bicep rename to modules/data-factory/factories/integration-runtime/main.bicep diff --git a/modules/data-factory/factories/integration-runtimes/main.json b/modules/data-factory/factories/integration-runtime/main.json similarity index 100% rename from modules/data-factory/factories/integration-runtimes/main.json rename to modules/data-factory/factories/integration-runtime/main.json diff --git a/modules/data-factory/factories/integration-runtimes/version.json b/modules/data-factory/factories/integration-runtime/version.json similarity index 100% rename from modules/data-factory/factories/integration-runtimes/version.json rename to modules/data-factory/factories/integration-runtime/version.json diff --git a/modules/data-factory/factories/main.bicep b/modules/data-factory/factories/main.bicep index 3c3c51d868..f4a7ae7072 100644 --- a/modules/data-factory/factories/main.bicep +++ b/modules/data-factory/factories/main.bicep @@ -225,7 +225,7 @@ resource dataFactory 'Microsoft.DataFactory/factories@2018-06-01' = { } } -module dataFactory_managedVirtualNetwork 'managed-virtual-networks/main.bicep' = if (!empty(managedVirtualNetworkName)) { +module dataFactory_managedVirtualNetwork 'managed-virtual-network/main.bicep' = if (!empty(managedVirtualNetworkName)) { name: '${uniqueString(deployment().name, location)}-DataFactory-ManagedVNet' params: { name: managedVirtualNetworkName @@ -235,7 +235,7 @@ module dataFactory_managedVirtualNetwork 'managed-virtual-networks/main.bicep' = } } -module dataFactory_integrationRuntimes 'integration-runtimes/main.bicep' = [for (integrationRuntime, index) in integrationRuntimes: { +module dataFactory_integrationRuntimes 'integration-runtime/main.bicep' = [for (integrationRuntime, index) in integrationRuntimes: { name: '${uniqueString(deployment().name, location)}-DataFactory-IntegrationRuntime-${index}' params: { dataFactoryName: dataFactory.name @@ -285,7 +285,7 @@ module dataFactory_roleAssignments '.bicep/nested_roleAssignments.bicep' = [for } }] -module dataFactory_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module dataFactory_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-DataFactory-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/data-factory/factories/managed-virtual-networks/README.md b/modules/data-factory/factories/managed-virtual-network/README.md similarity index 100% rename from modules/data-factory/factories/managed-virtual-networks/README.md rename to modules/data-factory/factories/managed-virtual-network/README.md diff --git a/modules/data-factory/factories/managed-virtual-networks/main.bicep b/modules/data-factory/factories/managed-virtual-network/main.bicep similarity index 95% rename from modules/data-factory/factories/managed-virtual-networks/main.bicep rename to modules/data-factory/factories/managed-virtual-network/main.bicep index ae06699efd..61e71c1ea7 100644 --- a/modules/data-factory/factories/managed-virtual-networks/main.bicep +++ b/modules/data-factory/factories/managed-virtual-network/main.bicep @@ -38,7 +38,7 @@ resource managedVirtualNetwork 'Microsoft.DataFactory/factories/managedVirtualNe properties: {} } -module managedVirtualNetwork_managedPrivateEndpoint 'managed-private-endpoints/main.bicep' = [for (managedPrivateEndpoint, index) in managedPrivateEndpoints: { +module managedVirtualNetwork_managedPrivateEndpoint 'managed-private-endpoint/main.bicep' = [for (managedPrivateEndpoint, index) in managedPrivateEndpoints: { name: '${deployment().name}-managedPrivateEndpoint-${index}' params: { dataFactoryName: dataFactoryName diff --git a/modules/data-factory/factories/managed-virtual-networks/main.json b/modules/data-factory/factories/managed-virtual-network/main.json similarity index 100% rename from modules/data-factory/factories/managed-virtual-networks/main.json rename to modules/data-factory/factories/managed-virtual-network/main.json diff --git a/modules/data-factory/factories/managed-virtual-networks/managed-private-endpoints/README.md b/modules/data-factory/factories/managed-virtual-network/managed-private-endpoints/README.md similarity index 100% rename from modules/data-factory/factories/managed-virtual-networks/managed-private-endpoints/README.md rename to modules/data-factory/factories/managed-virtual-network/managed-private-endpoints/README.md diff --git a/modules/data-factory/factories/managed-virtual-networks/managed-private-endpoints/main.bicep b/modules/data-factory/factories/managed-virtual-network/managed-private-endpoints/main.bicep similarity index 100% rename from modules/data-factory/factories/managed-virtual-networks/managed-private-endpoints/main.bicep rename to modules/data-factory/factories/managed-virtual-network/managed-private-endpoints/main.bicep diff --git a/modules/data-factory/factories/managed-virtual-networks/managed-private-endpoints/main.json b/modules/data-factory/factories/managed-virtual-network/managed-private-endpoints/main.json similarity index 100% rename from modules/data-factory/factories/managed-virtual-networks/managed-private-endpoints/main.json rename to modules/data-factory/factories/managed-virtual-network/managed-private-endpoints/main.json diff --git a/modules/data-factory/factories/managed-virtual-networks/managed-private-endpoints/version.json b/modules/data-factory/factories/managed-virtual-network/managed-private-endpoints/version.json similarity index 100% rename from modules/data-factory/factories/managed-virtual-networks/managed-private-endpoints/version.json rename to modules/data-factory/factories/managed-virtual-network/managed-private-endpoints/version.json diff --git a/modules/data-factory/factories/managed-virtual-networks/version.json b/modules/data-factory/factories/managed-virtual-network/version.json similarity index 100% rename from modules/data-factory/factories/managed-virtual-networks/version.json rename to modules/data-factory/factories/managed-virtual-network/version.json diff --git a/modules/data-protection/backup-vaults/.bicep/nested_roleAssignments.bicep b/modules/data-protection/backup-vault/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/data-protection/backup-vaults/.bicep/nested_roleAssignments.bicep rename to modules/data-protection/backup-vault/.bicep/nested_roleAssignments.bicep diff --git a/modules/data-protection/backup-vaults/.test/common/dependencies.bicep b/modules/data-protection/backup-vault/.test/common/dependencies.bicep similarity index 100% rename from modules/data-protection/backup-vaults/.test/common/dependencies.bicep rename to modules/data-protection/backup-vault/.test/common/dependencies.bicep diff --git a/modules/data-protection/backup-vaults/.test/common/main.test.bicep b/modules/data-protection/backup-vault/.test/common/main.test.bicep similarity index 100% rename from modules/data-protection/backup-vaults/.test/common/main.test.bicep rename to modules/data-protection/backup-vault/.test/common/main.test.bicep diff --git a/modules/data-protection/backup-vaults/.test/main.test.bicep b/modules/data-protection/backup-vault/.test/main.test.bicep similarity index 100% rename from modules/data-protection/backup-vaults/.test/main.test.bicep rename to modules/data-protection/backup-vault/.test/main.test.bicep diff --git a/modules/data-protection/backup-vaults/.test/min/main.test.bicep b/modules/data-protection/backup-vault/.test/min/main.test.bicep similarity index 100% rename from modules/data-protection/backup-vaults/.test/min/main.test.bicep rename to modules/data-protection/backup-vault/.test/min/main.test.bicep diff --git a/modules/data-protection/backup-vaults/README.md b/modules/data-protection/backup-vault/README.md similarity index 99% rename from modules/data-protection/backup-vaults/README.md rename to modules/data-protection/backup-vault/README.md index b9344723d2..a8ec89ee26 100644 --- a/modules/data-protection/backup-vaults/README.md +++ b/modules/data-protection/backup-vault/README.md @@ -351,7 +351,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module backupVaults './data-protection/backup-vaults/main.bicep' = { +module backupVaults './data-protection/backup-vault/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dpbvcom' params: { // Required parameters @@ -564,7 +564,7 @@ module backupVaults './data-protection/backup-vaults/main.bicep' = { via Bicep module ```bicep -module backupVaults './data-protection/backup-vaults/main.bicep' = { +module backupVaults './data-protection/backup-vault/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dpbvmin' params: { // Required parameters diff --git a/modules/data-protection/backup-vaults/backup-policies/README.md b/modules/data-protection/backup-vault/backup-policies/README.md similarity index 100% rename from modules/data-protection/backup-vaults/backup-policies/README.md rename to modules/data-protection/backup-vault/backup-policies/README.md diff --git a/modules/data-protection/backup-vaults/backup-policies/main.bicep b/modules/data-protection/backup-vault/backup-policies/main.bicep similarity index 100% rename from modules/data-protection/backup-vaults/backup-policies/main.bicep rename to modules/data-protection/backup-vault/backup-policies/main.bicep diff --git a/modules/data-protection/backup-vaults/backup-policies/main.json b/modules/data-protection/backup-vault/backup-policies/main.json similarity index 100% rename from modules/data-protection/backup-vaults/backup-policies/main.json rename to modules/data-protection/backup-vault/backup-policies/main.json diff --git a/modules/data-protection/backup-vaults/backup-policies/version.json b/modules/data-protection/backup-vault/backup-policies/version.json similarity index 100% rename from modules/data-protection/backup-vaults/backup-policies/version.json rename to modules/data-protection/backup-vault/backup-policies/version.json diff --git a/modules/data-protection/backup-vaults/main.bicep b/modules/data-protection/backup-vault/main.bicep similarity index 97% rename from modules/data-protection/backup-vaults/main.bicep rename to modules/data-protection/backup-vault/main.bicep index 5a13b146ec..c9057214e1 100644 --- a/modules/data-protection/backup-vaults/main.bicep +++ b/modules/data-protection/backup-vault/main.bicep @@ -94,7 +94,7 @@ resource backupVault 'Microsoft.DataProtection/backupVaults@2022-11-01-preview' } } -module backupVault_backupPolicies 'backup-policies/main.bicep' = [for (backupPolicy, index) in backupPolicies: { +module backupVault_backupPolicies 'backup-policy/main.bicep' = [for (backupPolicy, index) in backupPolicies: { name: '${uniqueString(deployment().name, location)}-BV-BackupPolicy-${index}' params: { backupVaultName: backupVault.name diff --git a/modules/data-protection/backup-vaults/main.json b/modules/data-protection/backup-vault/main.json similarity index 100% rename from modules/data-protection/backup-vaults/main.json rename to modules/data-protection/backup-vault/main.json diff --git a/modules/data-protection/backup-vaults/version.json b/modules/data-protection/backup-vault/version.json similarity index 100% rename from modules/data-protection/backup-vaults/version.json rename to modules/data-protection/backup-vault/version.json diff --git a/modules/databricks/workspaces/.bicep/nested_roleAssignments.bicep b/modules/databricks/workspace/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/databricks/workspaces/.bicep/nested_roleAssignments.bicep rename to modules/databricks/workspace/.bicep/nested_roleAssignments.bicep diff --git a/modules/databricks/workspaces/.test/common/dependencies.bicep b/modules/databricks/workspace/.test/common/dependencies.bicep similarity index 100% rename from modules/databricks/workspaces/.test/common/dependencies.bicep rename to modules/databricks/workspace/.test/common/dependencies.bicep diff --git a/modules/databricks/workspaces/.test/common/main.test.bicep b/modules/databricks/workspace/.test/common/main.test.bicep similarity index 100% rename from modules/databricks/workspaces/.test/common/main.test.bicep rename to modules/databricks/workspace/.test/common/main.test.bicep diff --git a/modules/databricks/workspaces/.test/main.test.bicep b/modules/databricks/workspace/.test/main.test.bicep similarity index 100% rename from modules/databricks/workspaces/.test/main.test.bicep rename to modules/databricks/workspace/.test/main.test.bicep diff --git a/modules/databricks/workspaces/README.md b/modules/databricks/workspace/README.md similarity index 99% rename from modules/databricks/workspaces/README.md rename to modules/databricks/workspace/README.md index b8f6b1a20d..5d44290736 100644 --- a/modules/databricks/workspaces/README.md +++ b/modules/databricks/workspace/README.md @@ -240,7 +240,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module workspaces './databricks/workspaces/main.bicep' = { +module workspaces './databricks/workspace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dwcom' params: { // Required parameters diff --git a/modules/databricks/workspaces/main.bicep b/modules/databricks/workspace/main.bicep similarity index 100% rename from modules/databricks/workspaces/main.bicep rename to modules/databricks/workspace/main.bicep diff --git a/modules/databricks/workspaces/main.json b/modules/databricks/workspace/main.json similarity index 100% rename from modules/databricks/workspaces/main.json rename to modules/databricks/workspace/main.json diff --git a/modules/databricks/workspaces/version.json b/modules/databricks/workspace/version.json similarity index 100% rename from modules/databricks/workspaces/version.json rename to modules/databricks/workspace/version.json diff --git a/modules/db-for-my-sql/flexible-servers/.bicep/nested_roleAssignments.bicep b/modules/db-for-my-sql/flexible-server/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/db-for-my-sql/flexible-servers/.bicep/nested_roleAssignments.bicep rename to modules/db-for-my-sql/flexible-server/.bicep/nested_roleAssignments.bicep diff --git a/modules/db-for-my-sql/flexible-servers/.test/main.test.bicep b/modules/db-for-my-sql/flexible-server/.test/main.test.bicep similarity index 100% rename from modules/db-for-my-sql/flexible-servers/.test/main.test.bicep rename to modules/db-for-my-sql/flexible-server/.test/main.test.bicep diff --git a/modules/db-for-my-sql/flexible-servers/.test/min/main.test.bicep b/modules/db-for-my-sql/flexible-server/.test/min/main.test.bicep similarity index 100% rename from modules/db-for-my-sql/flexible-servers/.test/min/main.test.bicep rename to modules/db-for-my-sql/flexible-server/.test/min/main.test.bicep diff --git a/modules/db-for-my-sql/flexible-servers/.test/private/dependencies.bicep b/modules/db-for-my-sql/flexible-server/.test/private/dependencies.bicep similarity index 100% rename from modules/db-for-my-sql/flexible-servers/.test/private/dependencies.bicep rename to modules/db-for-my-sql/flexible-server/.test/private/dependencies.bicep diff --git a/modules/db-for-my-sql/flexible-servers/.test/private/main.test.bicep b/modules/db-for-my-sql/flexible-server/.test/private/main.test.bicep similarity index 100% rename from modules/db-for-my-sql/flexible-servers/.test/private/main.test.bicep rename to modules/db-for-my-sql/flexible-server/.test/private/main.test.bicep diff --git a/modules/db-for-my-sql/flexible-servers/.test/public/dependencies1.bicep b/modules/db-for-my-sql/flexible-server/.test/public/dependencies1.bicep similarity index 100% rename from modules/db-for-my-sql/flexible-servers/.test/public/dependencies1.bicep rename to modules/db-for-my-sql/flexible-server/.test/public/dependencies1.bicep diff --git a/modules/db-for-my-sql/flexible-servers/.test/public/dependencies2.bicep b/modules/db-for-my-sql/flexible-server/.test/public/dependencies2.bicep similarity index 100% rename from modules/db-for-my-sql/flexible-servers/.test/public/dependencies2.bicep rename to modules/db-for-my-sql/flexible-server/.test/public/dependencies2.bicep diff --git a/modules/db-for-my-sql/flexible-servers/.test/public/main.test.bicep b/modules/db-for-my-sql/flexible-server/.test/public/main.test.bicep similarity index 100% rename from modules/db-for-my-sql/flexible-servers/.test/public/main.test.bicep rename to modules/db-for-my-sql/flexible-server/.test/public/main.test.bicep diff --git a/modules/db-for-my-sql/flexible-servers/README.md b/modules/db-for-my-sql/flexible-server/README.md similarity index 99% rename from modules/db-for-my-sql/flexible-servers/README.md rename to modules/db-for-my-sql/flexible-server/README.md index 590e1a5699..38be617a79 100644 --- a/modules/db-for-my-sql/flexible-servers/README.md +++ b/modules/db-for-my-sql/flexible-server/README.md @@ -244,7 +244,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module flexibleServers './db-for-my-sql/flexible-servers/main.bicep' = { +module flexibleServers './db-for-my-sql/flexible-server/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dfmsfsmin' params: { // Required parameters @@ -305,7 +305,7 @@ module flexibleServers './db-for-my-sql/flexible-servers/main.bicep' = { via Bicep module ```bicep -module flexibleServers './db-for-my-sql/flexible-servers/main.bicep' = { +module flexibleServers './db-for-my-sql/flexible-server/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dfmsfspvt' params: { // Required parameters @@ -476,7 +476,7 @@ module flexibleServers './db-for-my-sql/flexible-servers/main.bicep' = { via Bicep module ```bicep -module flexibleServers './db-for-my-sql/flexible-servers/main.bicep' = { +module flexibleServers './db-for-my-sql/flexible-server/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dfmsfsp' params: { // Required parameters diff --git a/modules/db-for-my-sql/flexible-servers/databases/README.md b/modules/db-for-my-sql/flexible-server/databases/README.md similarity index 100% rename from modules/db-for-my-sql/flexible-servers/databases/README.md rename to modules/db-for-my-sql/flexible-server/databases/README.md diff --git a/modules/db-for-my-sql/flexible-servers/databases/main.bicep b/modules/db-for-my-sql/flexible-server/databases/main.bicep similarity index 100% rename from modules/db-for-my-sql/flexible-servers/databases/main.bicep rename to modules/db-for-my-sql/flexible-server/databases/main.bicep diff --git a/modules/db-for-my-sql/flexible-servers/databases/main.json b/modules/db-for-my-sql/flexible-server/databases/main.json similarity index 100% rename from modules/db-for-my-sql/flexible-servers/databases/main.json rename to modules/db-for-my-sql/flexible-server/databases/main.json diff --git a/modules/db-for-my-sql/flexible-servers/databases/version.json b/modules/db-for-my-sql/flexible-server/databases/version.json similarity index 100% rename from modules/db-for-my-sql/flexible-servers/databases/version.json rename to modules/db-for-my-sql/flexible-server/databases/version.json diff --git a/modules/db-for-my-sql/flexible-servers/firewall-rules/README.md b/modules/db-for-my-sql/flexible-server/firewall-rules/README.md similarity index 100% rename from modules/db-for-my-sql/flexible-servers/firewall-rules/README.md rename to modules/db-for-my-sql/flexible-server/firewall-rules/README.md diff --git a/modules/db-for-my-sql/flexible-servers/firewall-rules/main.bicep b/modules/db-for-my-sql/flexible-server/firewall-rules/main.bicep similarity index 100% rename from modules/db-for-my-sql/flexible-servers/firewall-rules/main.bicep rename to modules/db-for-my-sql/flexible-server/firewall-rules/main.bicep diff --git a/modules/db-for-my-sql/flexible-servers/firewall-rules/main.json b/modules/db-for-my-sql/flexible-server/firewall-rules/main.json similarity index 100% rename from modules/db-for-my-sql/flexible-servers/firewall-rules/main.json rename to modules/db-for-my-sql/flexible-server/firewall-rules/main.json diff --git a/modules/db-for-my-sql/flexible-servers/firewall-rules/version.json b/modules/db-for-my-sql/flexible-server/firewall-rules/version.json similarity index 100% rename from modules/db-for-my-sql/flexible-servers/firewall-rules/version.json rename to modules/db-for-my-sql/flexible-server/firewall-rules/version.json diff --git a/modules/db-for-my-sql/flexible-servers/main.bicep b/modules/db-for-my-sql/flexible-server/main.bicep similarity index 98% rename from modules/db-for-my-sql/flexible-servers/main.bicep rename to modules/db-for-my-sql/flexible-server/main.bicep index 50b2224bd5..17e2f6914d 100644 --- a/modules/db-for-my-sql/flexible-servers/main.bicep +++ b/modules/db-for-my-sql/flexible-server/main.bicep @@ -361,7 +361,7 @@ module flexibleServer_roleAssignments '.bicep/nested_roleAssignments.bicep' = [f } }] -module flexibleServer_databases 'databases/main.bicep' = [for (database, index) in databases: { +module flexibleServer_databases 'database/main.bicep' = [for (database, index) in databases: { name: '${uniqueString(deployment().name, location)}-MySQL-DB-${index}' params: { name: database.name @@ -372,7 +372,7 @@ module flexibleServer_databases 'databases/main.bicep' = [for (database, index) } }] -module flexibleServer_firewallRules 'firewall-rules/main.bicep' = [for (firewallRule, index) in firewallRules: { +module flexibleServer_firewallRules 'firewall-rule/main.bicep' = [for (firewallRule, index) in firewallRules: { name: '${uniqueString(deployment().name, location)}-MySQL-FirewallRules-${index}' params: { name: firewallRule.name diff --git a/modules/db-for-my-sql/flexible-servers/main.json b/modules/db-for-my-sql/flexible-server/main.json similarity index 100% rename from modules/db-for-my-sql/flexible-servers/main.json rename to modules/db-for-my-sql/flexible-server/main.json diff --git a/modules/db-for-my-sql/flexible-servers/version.json b/modules/db-for-my-sql/flexible-server/version.json similarity index 100% rename from modules/db-for-my-sql/flexible-servers/version.json rename to modules/db-for-my-sql/flexible-server/version.json diff --git a/modules/db-for-postgre-sql/flexible-servers/.bicep/nested_roleAssignments.bicep b/modules/db-for-postgre-sql/flexible-server/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/db-for-postgre-sql/flexible-servers/.bicep/nested_roleAssignments.bicep rename to modules/db-for-postgre-sql/flexible-server/.bicep/nested_roleAssignments.bicep diff --git a/modules/db-for-postgre-sql/flexible-servers/.test/main.test.bicep b/modules/db-for-postgre-sql/flexible-server/.test/main.test.bicep similarity index 100% rename from modules/db-for-postgre-sql/flexible-servers/.test/main.test.bicep rename to modules/db-for-postgre-sql/flexible-server/.test/main.test.bicep diff --git a/modules/db-for-postgre-sql/flexible-servers/.test/min/main.test.bicep b/modules/db-for-postgre-sql/flexible-server/.test/min/main.test.bicep similarity index 100% rename from modules/db-for-postgre-sql/flexible-servers/.test/min/main.test.bicep rename to modules/db-for-postgre-sql/flexible-server/.test/min/main.test.bicep diff --git a/modules/db-for-postgre-sql/flexible-servers/.test/private/dependencies.bicep b/modules/db-for-postgre-sql/flexible-server/.test/private/dependencies.bicep similarity index 100% rename from modules/db-for-postgre-sql/flexible-servers/.test/private/dependencies.bicep rename to modules/db-for-postgre-sql/flexible-server/.test/private/dependencies.bicep diff --git a/modules/db-for-postgre-sql/flexible-servers/.test/private/main.test.bicep b/modules/db-for-postgre-sql/flexible-server/.test/private/main.test.bicep similarity index 100% rename from modules/db-for-postgre-sql/flexible-servers/.test/private/main.test.bicep rename to modules/db-for-postgre-sql/flexible-server/.test/private/main.test.bicep diff --git a/modules/db-for-postgre-sql/flexible-servers/.test/public/dependencies.bicep b/modules/db-for-postgre-sql/flexible-server/.test/public/dependencies.bicep similarity index 100% rename from modules/db-for-postgre-sql/flexible-servers/.test/public/dependencies.bicep rename to modules/db-for-postgre-sql/flexible-server/.test/public/dependencies.bicep diff --git a/modules/db-for-postgre-sql/flexible-servers/.test/public/main.test.bicep b/modules/db-for-postgre-sql/flexible-server/.test/public/main.test.bicep similarity index 100% rename from modules/db-for-postgre-sql/flexible-servers/.test/public/main.test.bicep rename to modules/db-for-postgre-sql/flexible-server/.test/public/main.test.bicep diff --git a/modules/db-for-postgre-sql/flexible-servers/README.md b/modules/db-for-postgre-sql/flexible-server/README.md similarity index 99% rename from modules/db-for-postgre-sql/flexible-servers/README.md rename to modules/db-for-postgre-sql/flexible-server/README.md index fbb46909d1..bfc4d14c56 100644 --- a/modules/db-for-postgre-sql/flexible-servers/README.md +++ b/modules/db-for-postgre-sql/flexible-server/README.md @@ -381,7 +381,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module flexibleServers './db-for-postgre-sql/flexible-servers/main.bicep' = { +module flexibleServers './db-for-postgre-sql/flexible-server/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dfpsfsmin' params: { // Required parameters @@ -442,7 +442,7 @@ module flexibleServers './db-for-postgre-sql/flexible-servers/main.bicep' = { via Bicep module ```bicep -module flexibleServers './db-for-postgre-sql/flexible-servers/main.bicep' = { +module flexibleServers './db-for-postgre-sql/flexible-server/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dfpsfspvt' params: { // Required parameters @@ -593,7 +593,7 @@ module flexibleServers './db-for-postgre-sql/flexible-servers/main.bicep' = { via Bicep module ```bicep -module flexibleServers './db-for-postgre-sql/flexible-servers/main.bicep' = { +module flexibleServers './db-for-postgre-sql/flexible-server/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dfpsfsp' params: { // Required parameters diff --git a/modules/db-for-postgre-sql/flexible-servers/configurations/README.md b/modules/db-for-postgre-sql/flexible-server/configurations/README.md similarity index 100% rename from modules/db-for-postgre-sql/flexible-servers/configurations/README.md rename to modules/db-for-postgre-sql/flexible-server/configurations/README.md diff --git a/modules/db-for-postgre-sql/flexible-servers/configurations/main.bicep b/modules/db-for-postgre-sql/flexible-server/configurations/main.bicep similarity index 100% rename from modules/db-for-postgre-sql/flexible-servers/configurations/main.bicep rename to modules/db-for-postgre-sql/flexible-server/configurations/main.bicep diff --git a/modules/db-for-postgre-sql/flexible-servers/configurations/main.json b/modules/db-for-postgre-sql/flexible-server/configurations/main.json similarity index 100% rename from modules/db-for-postgre-sql/flexible-servers/configurations/main.json rename to modules/db-for-postgre-sql/flexible-server/configurations/main.json diff --git a/modules/db-for-postgre-sql/flexible-servers/configurations/version.json b/modules/db-for-postgre-sql/flexible-server/configurations/version.json similarity index 100% rename from modules/db-for-postgre-sql/flexible-servers/configurations/version.json rename to modules/db-for-postgre-sql/flexible-server/configurations/version.json diff --git a/modules/db-for-postgre-sql/flexible-servers/databases/README.md b/modules/db-for-postgre-sql/flexible-server/databases/README.md similarity index 100% rename from modules/db-for-postgre-sql/flexible-servers/databases/README.md rename to modules/db-for-postgre-sql/flexible-server/databases/README.md diff --git a/modules/db-for-postgre-sql/flexible-servers/databases/main.bicep b/modules/db-for-postgre-sql/flexible-server/databases/main.bicep similarity index 100% rename from modules/db-for-postgre-sql/flexible-servers/databases/main.bicep rename to modules/db-for-postgre-sql/flexible-server/databases/main.bicep diff --git a/modules/db-for-postgre-sql/flexible-servers/databases/main.json b/modules/db-for-postgre-sql/flexible-server/databases/main.json similarity index 100% rename from modules/db-for-postgre-sql/flexible-servers/databases/main.json rename to modules/db-for-postgre-sql/flexible-server/databases/main.json diff --git a/modules/db-for-postgre-sql/flexible-servers/databases/version.json b/modules/db-for-postgre-sql/flexible-server/databases/version.json similarity index 100% rename from modules/db-for-postgre-sql/flexible-servers/databases/version.json rename to modules/db-for-postgre-sql/flexible-server/databases/version.json diff --git a/modules/db-for-postgre-sql/flexible-servers/firewall-rules/README.md b/modules/db-for-postgre-sql/flexible-server/firewall-rules/README.md similarity index 100% rename from modules/db-for-postgre-sql/flexible-servers/firewall-rules/README.md rename to modules/db-for-postgre-sql/flexible-server/firewall-rules/README.md diff --git a/modules/db-for-postgre-sql/flexible-servers/firewall-rules/main.bicep b/modules/db-for-postgre-sql/flexible-server/firewall-rules/main.bicep similarity index 100% rename from modules/db-for-postgre-sql/flexible-servers/firewall-rules/main.bicep rename to modules/db-for-postgre-sql/flexible-server/firewall-rules/main.bicep diff --git a/modules/db-for-postgre-sql/flexible-servers/firewall-rules/main.json b/modules/db-for-postgre-sql/flexible-server/firewall-rules/main.json similarity index 100% rename from modules/db-for-postgre-sql/flexible-servers/firewall-rules/main.json rename to modules/db-for-postgre-sql/flexible-server/firewall-rules/main.json diff --git a/modules/db-for-postgre-sql/flexible-servers/firewall-rules/version.json b/modules/db-for-postgre-sql/flexible-server/firewall-rules/version.json similarity index 100% rename from modules/db-for-postgre-sql/flexible-servers/firewall-rules/version.json rename to modules/db-for-postgre-sql/flexible-server/firewall-rules/version.json diff --git a/modules/db-for-postgre-sql/flexible-servers/main.bicep b/modules/db-for-postgre-sql/flexible-server/main.bicep similarity index 97% rename from modules/db-for-postgre-sql/flexible-servers/main.bicep rename to modules/db-for-postgre-sql/flexible-server/main.bicep index d0aac629e9..48ff43f1c2 100644 --- a/modules/db-for-postgre-sql/flexible-servers/main.bicep +++ b/modules/db-for-postgre-sql/flexible-server/main.bicep @@ -307,7 +307,7 @@ module flexibleServer_roleAssignments '.bicep/nested_roleAssignments.bicep' = [f } }] -module flexibleServer_databases 'databases/main.bicep' = [for (database, index) in databases: { +module flexibleServer_databases 'database/main.bicep' = [for (database, index) in databases: { name: '${uniqueString(deployment().name, location)}-PostgreSQL-DB-${index}' params: { name: database.name @@ -318,7 +318,7 @@ module flexibleServer_databases 'databases/main.bicep' = [for (database, index) } }] -module flexibleServer_firewallRules 'firewall-rules/main.bicep' = [for (firewallRule, index) in firewallRules: { +module flexibleServer_firewallRules 'firewall-rule/main.bicep' = [for (firewallRule, index) in firewallRules: { name: '${uniqueString(deployment().name, location)}-PostgreSQL-FirewallRules-${index}' params: { name: firewallRule.name @@ -332,7 +332,7 @@ module flexibleServer_firewallRules 'firewall-rules/main.bicep' = [for (firewall ] }] -module flexibleServer_configurations 'configurations/main.bicep' = [for (configuration, index) in configurations: { +module flexibleServer_configurations 'configuration/main.bicep' = [for (configuration, index) in configurations: { name: '${uniqueString(deployment().name, location)}-PostgreSQL-Configurations-${index}' params: { name: configuration.name diff --git a/modules/db-for-postgre-sql/flexible-servers/main.json b/modules/db-for-postgre-sql/flexible-server/main.json similarity index 100% rename from modules/db-for-postgre-sql/flexible-servers/main.json rename to modules/db-for-postgre-sql/flexible-server/main.json diff --git a/modules/db-for-postgre-sql/flexible-servers/version.json b/modules/db-for-postgre-sql/flexible-server/version.json similarity index 100% rename from modules/db-for-postgre-sql/flexible-servers/version.json rename to modules/db-for-postgre-sql/flexible-server/version.json diff --git a/modules/desktop-virtualization/application-groups/.bicep/nested_roleAssignments.bicep b/modules/desktop-virtualization/application-group/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/desktop-virtualization/application-groups/.bicep/nested_roleAssignments.bicep rename to modules/desktop-virtualization/application-group/.bicep/nested_roleAssignments.bicep diff --git a/modules/desktop-virtualization/application-groups/.test/common/dependencies.bicep b/modules/desktop-virtualization/application-group/.test/common/dependencies.bicep similarity index 100% rename from modules/desktop-virtualization/application-groups/.test/common/dependencies.bicep rename to modules/desktop-virtualization/application-group/.test/common/dependencies.bicep diff --git a/modules/desktop-virtualization/application-groups/.test/common/main.test.bicep b/modules/desktop-virtualization/application-group/.test/common/main.test.bicep similarity index 100% rename from modules/desktop-virtualization/application-groups/.test/common/main.test.bicep rename to modules/desktop-virtualization/application-group/.test/common/main.test.bicep diff --git a/modules/desktop-virtualization/application-groups/.test/main.test.bicep b/modules/desktop-virtualization/application-group/.test/main.test.bicep similarity index 100% rename from modules/desktop-virtualization/application-groups/.test/main.test.bicep rename to modules/desktop-virtualization/application-group/.test/main.test.bicep diff --git a/modules/desktop-virtualization/application-groups/.test/min/dependencies.bicep b/modules/desktop-virtualization/application-group/.test/min/dependencies.bicep similarity index 100% rename from modules/desktop-virtualization/application-groups/.test/min/dependencies.bicep rename to modules/desktop-virtualization/application-group/.test/min/dependencies.bicep diff --git a/modules/desktop-virtualization/application-groups/.test/min/main.test.bicep b/modules/desktop-virtualization/application-group/.test/min/main.test.bicep similarity index 100% rename from modules/desktop-virtualization/application-groups/.test/min/main.test.bicep rename to modules/desktop-virtualization/application-group/.test/min/main.test.bicep diff --git a/modules/desktop-virtualization/application-groups/README.md b/modules/desktop-virtualization/application-group/README.md similarity index 99% rename from modules/desktop-virtualization/application-groups/README.md rename to modules/desktop-virtualization/application-group/README.md index 974356762a..b848104b87 100644 --- a/modules/desktop-virtualization/application-groups/README.md +++ b/modules/desktop-virtualization/application-group/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 './desktop-virtualization/application-groups/main.bicep' = { +module applicationGroups './desktop-virtualization/application-group/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dvagcom' params: { // Required parameters @@ -335,7 +335,7 @@ module applicationGroups './desktop-virtualization/application-groups/main.bicep via Bicep module ```bicep -module applicationGroups './desktop-virtualization/application-groups/main.bicep' = { +module applicationGroups './desktop-virtualization/application-group/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dvagmin' params: { // Required parameters diff --git a/modules/desktop-virtualization/application-groups/applications/README.md b/modules/desktop-virtualization/application-group/applications/README.md similarity index 100% rename from modules/desktop-virtualization/application-groups/applications/README.md rename to modules/desktop-virtualization/application-group/applications/README.md diff --git a/modules/desktop-virtualization/application-groups/applications/main.bicep b/modules/desktop-virtualization/application-group/applications/main.bicep similarity index 100% rename from modules/desktop-virtualization/application-groups/applications/main.bicep rename to modules/desktop-virtualization/application-group/applications/main.bicep diff --git a/modules/desktop-virtualization/application-groups/applications/main.json b/modules/desktop-virtualization/application-group/applications/main.json similarity index 100% rename from modules/desktop-virtualization/application-groups/applications/main.json rename to modules/desktop-virtualization/application-group/applications/main.json diff --git a/modules/desktop-virtualization/application-groups/applications/version.json b/modules/desktop-virtualization/application-group/applications/version.json similarity index 100% rename from modules/desktop-virtualization/application-groups/applications/version.json rename to modules/desktop-virtualization/application-group/applications/version.json diff --git a/modules/desktop-virtualization/application-groups/main.bicep b/modules/desktop-virtualization/application-group/main.bicep similarity index 98% rename from modules/desktop-virtualization/application-groups/main.bicep rename to modules/desktop-virtualization/application-group/main.bicep index 49bf82cd86..4039305515 100644 --- a/modules/desktop-virtualization/application-groups/main.bicep +++ b/modules/desktop-virtualization/application-group/main.bicep @@ -148,7 +148,7 @@ resource appGroup_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@2021 scope: appGroup } -module appGroup_applications 'applications/main.bicep' = [for (application, index) in applications: { +module appGroup_applications 'application/main.bicep' = [for (application, index) in applications: { name: '${uniqueString(deployment().name, location)}-AppGroup-App-${index}' params: { name: application.name diff --git a/modules/desktop-virtualization/application-groups/main.json b/modules/desktop-virtualization/application-group/main.json similarity index 100% rename from modules/desktop-virtualization/application-groups/main.json rename to modules/desktop-virtualization/application-group/main.json diff --git a/modules/desktop-virtualization/application-groups/version.json b/modules/desktop-virtualization/application-group/version.json similarity index 100% rename from modules/desktop-virtualization/application-groups/version.json rename to modules/desktop-virtualization/application-group/version.json diff --git a/modules/desktop-virtualization/host-pools/.bicep/nested_roleAssignments.bicep b/modules/desktop-virtualization/host-pool/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/desktop-virtualization/host-pools/.bicep/nested_roleAssignments.bicep rename to modules/desktop-virtualization/host-pool/.bicep/nested_roleAssignments.bicep diff --git a/modules/desktop-virtualization/host-pools/.test/common/dependencies.bicep b/modules/desktop-virtualization/host-pool/.test/common/dependencies.bicep similarity index 100% rename from modules/desktop-virtualization/host-pools/.test/common/dependencies.bicep rename to modules/desktop-virtualization/host-pool/.test/common/dependencies.bicep diff --git a/modules/desktop-virtualization/host-pools/.test/common/main.test.bicep b/modules/desktop-virtualization/host-pool/.test/common/main.test.bicep similarity index 100% rename from modules/desktop-virtualization/host-pools/.test/common/main.test.bicep rename to modules/desktop-virtualization/host-pool/.test/common/main.test.bicep diff --git a/modules/desktop-virtualization/host-pools/.test/main.test.bicep b/modules/desktop-virtualization/host-pool/.test/main.test.bicep similarity index 100% rename from modules/desktop-virtualization/host-pools/.test/main.test.bicep rename to modules/desktop-virtualization/host-pool/.test/main.test.bicep diff --git a/modules/desktop-virtualization/host-pools/.test/min/main.test.bicep b/modules/desktop-virtualization/host-pool/.test/min/main.test.bicep similarity index 100% rename from modules/desktop-virtualization/host-pools/.test/min/main.test.bicep rename to modules/desktop-virtualization/host-pool/.test/min/main.test.bicep diff --git a/modules/desktop-virtualization/host-pools/README.md b/modules/desktop-virtualization/host-pool/README.md similarity index 99% rename from modules/desktop-virtualization/host-pools/README.md rename to modules/desktop-virtualization/host-pool/README.md index 9753846268..73cfb265a4 100644 --- a/modules/desktop-virtualization/host-pools/README.md +++ b/modules/desktop-virtualization/host-pool/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 './desktop-virtualization/host-pools/main.bicep' = { +module hostPools './desktop-virtualization/host-pool/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dvhpcom' params: { // Required parameters @@ -480,7 +480,7 @@ module hostPools './desktop-virtualization/host-pools/main.bicep' = { via Bicep module ```bicep -module hostPools './desktop-virtualization/host-pools/main.bicep' = { +module hostPools './desktop-virtualization/host-pool/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dvhpmin' params: { // Required parameters diff --git a/modules/desktop-virtualization/host-pools/main.bicep b/modules/desktop-virtualization/host-pool/main.bicep similarity index 100% rename from modules/desktop-virtualization/host-pools/main.bicep rename to modules/desktop-virtualization/host-pool/main.bicep diff --git a/modules/desktop-virtualization/host-pools/main.json b/modules/desktop-virtualization/host-pool/main.json similarity index 100% rename from modules/desktop-virtualization/host-pools/main.json rename to modules/desktop-virtualization/host-pool/main.json diff --git a/modules/desktop-virtualization/host-pools/version.json b/modules/desktop-virtualization/host-pool/version.json similarity index 100% rename from modules/desktop-virtualization/host-pools/version.json rename to modules/desktop-virtualization/host-pool/version.json diff --git a/modules/desktop-virtualization/scaling-plans/.bicep/nested_roleAssignments.bicep b/modules/desktop-virtualization/scaling-plan/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/desktop-virtualization/scaling-plans/.bicep/nested_roleAssignments.bicep rename to modules/desktop-virtualization/scaling-plan/.bicep/nested_roleAssignments.bicep diff --git a/modules/desktop-virtualization/scaling-plans/.test/common/dependencies.bicep b/modules/desktop-virtualization/scaling-plan/.test/common/dependencies.bicep similarity index 100% rename from modules/desktop-virtualization/scaling-plans/.test/common/dependencies.bicep rename to modules/desktop-virtualization/scaling-plan/.test/common/dependencies.bicep diff --git a/modules/desktop-virtualization/scaling-plans/.test/common/main.test.bicep b/modules/desktop-virtualization/scaling-plan/.test/common/main.test.bicep similarity index 100% rename from modules/desktop-virtualization/scaling-plans/.test/common/main.test.bicep rename to modules/desktop-virtualization/scaling-plan/.test/common/main.test.bicep diff --git a/modules/desktop-virtualization/scaling-plans/.test/main.test.bicep b/modules/desktop-virtualization/scaling-plan/.test/main.test.bicep similarity index 100% rename from modules/desktop-virtualization/scaling-plans/.test/main.test.bicep rename to modules/desktop-virtualization/scaling-plan/.test/main.test.bicep diff --git a/modules/desktop-virtualization/scaling-plans/.test/min/main.test.bicep b/modules/desktop-virtualization/scaling-plan/.test/min/main.test.bicep similarity index 100% rename from modules/desktop-virtualization/scaling-plans/.test/min/main.test.bicep rename to modules/desktop-virtualization/scaling-plan/.test/min/main.test.bicep diff --git a/modules/desktop-virtualization/scaling-plans/README.md b/modules/desktop-virtualization/scaling-plan/README.md similarity index 98% rename from modules/desktop-virtualization/scaling-plans/README.md rename to modules/desktop-virtualization/scaling-plan/README.md index fc3dbcf80f..5afd7bc72f 100644 --- a/modules/desktop-virtualization/scaling-plans/README.md +++ b/modules/desktop-virtualization/scaling-plan/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 './desktop-virtualization/scaling-plans/main.bicep' = { +module scalingPlans './desktop-virtualization/scaling-plan/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dvspcom' params: { // Required parameters @@ -384,7 +384,7 @@ module scalingPlans './desktop-virtualization/scaling-plans/main.bicep' = { via Bicep module ```bicep -module scalingPlans './desktop-virtualization/scaling-plans/main.bicep' = { +module scalingPlans './desktop-virtualization/scaling-plan/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dvspmin' params: { // Required parameters diff --git a/modules/desktop-virtualization/scaling-plans/main.bicep b/modules/desktop-virtualization/scaling-plan/main.bicep similarity index 100% rename from modules/desktop-virtualization/scaling-plans/main.bicep rename to modules/desktop-virtualization/scaling-plan/main.bicep diff --git a/modules/desktop-virtualization/scaling-plans/main.json b/modules/desktop-virtualization/scaling-plan/main.json similarity index 100% rename from modules/desktop-virtualization/scaling-plans/main.json rename to modules/desktop-virtualization/scaling-plan/main.json diff --git a/modules/desktop-virtualization/scaling-plans/version.json b/modules/desktop-virtualization/scaling-plan/version.json similarity index 100% rename from modules/desktop-virtualization/scaling-plans/version.json rename to modules/desktop-virtualization/scaling-plan/version.json diff --git a/modules/desktop-virtualization/workspaces/.bicep/nested_roleAssignments.bicep b/modules/desktop-virtualization/workspace/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/desktop-virtualization/workspaces/.bicep/nested_roleAssignments.bicep rename to modules/desktop-virtualization/workspace/.bicep/nested_roleAssignments.bicep diff --git a/modules/desktop-virtualization/workspaces/.test/common/dependencies.bicep b/modules/desktop-virtualization/workspace/.test/common/dependencies.bicep similarity index 100% rename from modules/desktop-virtualization/workspaces/.test/common/dependencies.bicep rename to modules/desktop-virtualization/workspace/.test/common/dependencies.bicep diff --git a/modules/desktop-virtualization/workspaces/.test/common/main.test.bicep b/modules/desktop-virtualization/workspace/.test/common/main.test.bicep similarity index 100% rename from modules/desktop-virtualization/workspaces/.test/common/main.test.bicep rename to modules/desktop-virtualization/workspace/.test/common/main.test.bicep diff --git a/modules/desktop-virtualization/workspaces/.test/main.test.bicep b/modules/desktop-virtualization/workspace/.test/main.test.bicep similarity index 100% rename from modules/desktop-virtualization/workspaces/.test/main.test.bicep rename to modules/desktop-virtualization/workspace/.test/main.test.bicep diff --git a/modules/desktop-virtualization/workspaces/.test/min/main.test.bicep b/modules/desktop-virtualization/workspace/.test/min/main.test.bicep similarity index 100% rename from modules/desktop-virtualization/workspaces/.test/min/main.test.bicep rename to modules/desktop-virtualization/workspace/.test/min/main.test.bicep diff --git a/modules/desktop-virtualization/workspaces/README.md b/modules/desktop-virtualization/workspace/README.md similarity index 98% rename from modules/desktop-virtualization/workspaces/README.md rename to modules/desktop-virtualization/workspace/README.md index 9df804638f..d424f4929e 100644 --- a/modules/desktop-virtualization/workspaces/README.md +++ b/modules/desktop-virtualization/workspace/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 './desktop-virtualization/workspaces/main.bicep' = { +module workspaces './desktop-virtualization/workspace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dvwcom' params: { // Required parameters @@ -294,7 +294,7 @@ module workspaces './desktop-virtualization/workspaces/main.bicep' = { via Bicep module ```bicep -module workspaces './desktop-virtualization/workspaces/main.bicep' = { +module workspaces './desktop-virtualization/workspace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dvwmin' params: { // Required parameters diff --git a/modules/desktop-virtualization/workspaces/main.bicep b/modules/desktop-virtualization/workspace/main.bicep similarity index 100% rename from modules/desktop-virtualization/workspaces/main.bicep rename to modules/desktop-virtualization/workspace/main.bicep diff --git a/modules/desktop-virtualization/workspaces/main.json b/modules/desktop-virtualization/workspace/main.json similarity index 100% rename from modules/desktop-virtualization/workspaces/main.json rename to modules/desktop-virtualization/workspace/main.json diff --git a/modules/desktop-virtualization/workspaces/version.json b/modules/desktop-virtualization/workspace/version.json similarity index 100% rename from modules/desktop-virtualization/workspaces/version.json rename to modules/desktop-virtualization/workspace/version.json diff --git a/modules/dev-test-lab/labs/.bicep/nested_roleAssignments.bicep b/modules/dev-test-lab/lab/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/dev-test-lab/labs/.bicep/nested_roleAssignments.bicep rename to modules/dev-test-lab/lab/.bicep/nested_roleAssignments.bicep diff --git a/modules/dev-test-lab/labs/.test/common/dependencies.bicep b/modules/dev-test-lab/lab/.test/common/dependencies.bicep similarity index 100% rename from modules/dev-test-lab/labs/.test/common/dependencies.bicep rename to modules/dev-test-lab/lab/.test/common/dependencies.bicep diff --git a/modules/dev-test-lab/labs/.test/common/main.test.bicep b/modules/dev-test-lab/lab/.test/common/main.test.bicep similarity index 100% rename from modules/dev-test-lab/labs/.test/common/main.test.bicep rename to modules/dev-test-lab/lab/.test/common/main.test.bicep diff --git a/modules/dev-test-lab/labs/.test/main.test.bicep b/modules/dev-test-lab/lab/.test/main.test.bicep similarity index 100% rename from modules/dev-test-lab/labs/.test/main.test.bicep rename to modules/dev-test-lab/lab/.test/main.test.bicep diff --git a/modules/dev-test-lab/labs/.test/min/main.test.bicep b/modules/dev-test-lab/lab/.test/min/main.test.bicep similarity index 100% rename from modules/dev-test-lab/labs/.test/min/main.test.bicep rename to modules/dev-test-lab/lab/.test/min/main.test.bicep diff --git a/modules/dev-test-lab/labs/README.md b/modules/dev-test-lab/lab/README.md similarity index 99% rename from modules/dev-test-lab/labs/README.md rename to modules/dev-test-lab/lab/README.md index 9e4ba78d9e..e37567c373 100644 --- a/modules/dev-test-lab/labs/README.md +++ b/modules/dev-test-lab/lab/README.md @@ -233,7 +233,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module labs './dev-test-lab/labs/main.bicep' = { +module labs './dev-test-lab/lab/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dtllcom' params: { // Required parameters @@ -764,7 +764,7 @@ module labs './dev-test-lab/labs/main.bicep' = { via Bicep module ```bicep -module labs './dev-test-lab/labs/main.bicep' = { +module labs './dev-test-lab/lab/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dtllmin' params: { // Required parameters diff --git a/modules/dev-test-lab/labs/artifactsources/README.md b/modules/dev-test-lab/lab/artifactsources/README.md similarity index 100% rename from modules/dev-test-lab/labs/artifactsources/README.md rename to modules/dev-test-lab/lab/artifactsources/README.md diff --git a/modules/dev-test-lab/labs/artifactsources/main.bicep b/modules/dev-test-lab/lab/artifactsources/main.bicep similarity index 100% rename from modules/dev-test-lab/labs/artifactsources/main.bicep rename to modules/dev-test-lab/lab/artifactsources/main.bicep diff --git a/modules/dev-test-lab/labs/artifactsources/main.json b/modules/dev-test-lab/lab/artifactsources/main.json similarity index 100% rename from modules/dev-test-lab/labs/artifactsources/main.json rename to modules/dev-test-lab/lab/artifactsources/main.json diff --git a/modules/dev-test-lab/labs/artifactsources/version.json b/modules/dev-test-lab/lab/artifactsources/version.json similarity index 100% rename from modules/dev-test-lab/labs/artifactsources/version.json rename to modules/dev-test-lab/lab/artifactsources/version.json diff --git a/modules/dev-test-lab/labs/costs/README.md b/modules/dev-test-lab/lab/costs/README.md similarity index 100% rename from modules/dev-test-lab/labs/costs/README.md rename to modules/dev-test-lab/lab/costs/README.md diff --git a/modules/dev-test-lab/labs/costs/main.bicep b/modules/dev-test-lab/lab/costs/main.bicep similarity index 100% rename from modules/dev-test-lab/labs/costs/main.bicep rename to modules/dev-test-lab/lab/costs/main.bicep diff --git a/modules/dev-test-lab/labs/costs/main.json b/modules/dev-test-lab/lab/costs/main.json similarity index 100% rename from modules/dev-test-lab/labs/costs/main.json rename to modules/dev-test-lab/lab/costs/main.json diff --git a/modules/dev-test-lab/labs/costs/version.json b/modules/dev-test-lab/lab/costs/version.json similarity index 100% rename from modules/dev-test-lab/labs/costs/version.json rename to modules/dev-test-lab/lab/costs/version.json diff --git a/modules/dev-test-lab/labs/main.bicep b/modules/dev-test-lab/lab/main.bicep similarity index 96% rename from modules/dev-test-lab/labs/main.bicep rename to modules/dev-test-lab/lab/main.bicep index 87f304c41c..bb996a3239 100644 --- a/modules/dev-test-lab/labs/main.bicep +++ b/modules/dev-test-lab/lab/main.bicep @@ -172,7 +172,7 @@ resource lab_lock 'Microsoft.Authorization/locks@2020-05-01' = if (!empty(lock)) scope: lab } -module lab_virtualNetworks 'virtualnetworks/main.bicep' = [for (virtualNetwork, index) in virtualnetworks: { +module lab_virtualNetworks 'virtualnetwork/main.bicep' = [for (virtualNetwork, index) in virtualnetworks: { name: '${uniqueString(deployment().name, location)}-Lab-VirtualNetwork-${index}' params: { labName: lab.name @@ -186,7 +186,7 @@ module lab_virtualNetworks 'virtualnetworks/main.bicep' = [for (virtualNetwork, } }] -module lab_policies 'policysets/policies/main.bicep' = [for (policy, index) in policies: { +module lab_policies 'policyset/policy/main.bicep' = [for (policy, index) in policies: { name: '${uniqueString(deployment().name, location)}-Lab-PolicySets-Policy-${index}' params: { labName: lab.name @@ -202,7 +202,7 @@ module lab_policies 'policysets/policies/main.bicep' = [for (policy, index) in p } }] -module lab_schedules 'schedules/main.bicep' = [for (schedule, index) in schedules: { +module lab_schedules 'schedule/main.bicep' = [for (schedule, index) in schedules: { name: '${uniqueString(deployment().name, location)}-Lab-Schedules-${index}' params: { labName: lab.name @@ -221,7 +221,7 @@ module lab_schedules 'schedules/main.bicep' = [for (schedule, index) in schedule } }] -module lab_notificationChannels 'notificationchannels/main.bicep' = [for (notificationChannel, index) in notificationchannels: { +module lab_notificationChannels 'notificationchannel/main.bicep' = [for (notificationChannel, index) in notificationchannels: { name: '${uniqueString(deployment().name, location)}-Lab-NotificationChannels-${index}' params: { labName: lab.name @@ -236,7 +236,7 @@ module lab_notificationChannels 'notificationchannels/main.bicep' = [for (notifi } }] -module lab_artifactSources 'artifactsources/main.bicep' = [for (artifactSource, index) in artifactsources: { +module lab_artifactSources 'artifactsource/main.bicep' = [for (artifactSource, index) in artifactsources: { name: '${uniqueString(deployment().name, location)}-Lab-ArtifactSources-${index}' params: { labName: lab.name @@ -253,7 +253,7 @@ module lab_artifactSources 'artifactsources/main.bicep' = [for (artifactSource, } }] -module lab_costs 'costs/main.bicep' = if (!empty(costs)) { +module lab_costs 'cost/main.bicep' = if (!empty(costs)) { name: '${uniqueString(deployment().name, location)}-Lab-Costs' params: { labName: lab.name diff --git a/modules/dev-test-lab/labs/main.json b/modules/dev-test-lab/lab/main.json similarity index 100% rename from modules/dev-test-lab/labs/main.json rename to modules/dev-test-lab/lab/main.json diff --git a/modules/dev-test-lab/labs/notificationchannels/README.md b/modules/dev-test-lab/lab/notificationchannels/README.md similarity index 100% rename from modules/dev-test-lab/labs/notificationchannels/README.md rename to modules/dev-test-lab/lab/notificationchannels/README.md diff --git a/modules/dev-test-lab/labs/notificationchannels/main.bicep b/modules/dev-test-lab/lab/notificationchannels/main.bicep similarity index 100% rename from modules/dev-test-lab/labs/notificationchannels/main.bicep rename to modules/dev-test-lab/lab/notificationchannels/main.bicep diff --git a/modules/dev-test-lab/labs/notificationchannels/main.json b/modules/dev-test-lab/lab/notificationchannels/main.json similarity index 100% rename from modules/dev-test-lab/labs/notificationchannels/main.json rename to modules/dev-test-lab/lab/notificationchannels/main.json diff --git a/modules/dev-test-lab/labs/notificationchannels/version.json b/modules/dev-test-lab/lab/notificationchannels/version.json similarity index 100% rename from modules/dev-test-lab/labs/notificationchannels/version.json rename to modules/dev-test-lab/lab/notificationchannels/version.json diff --git a/modules/dev-test-lab/labs/policysets/policies/README.md b/modules/dev-test-lab/lab/policysets/policies/README.md similarity index 100% rename from modules/dev-test-lab/labs/policysets/policies/README.md rename to modules/dev-test-lab/lab/policysets/policies/README.md diff --git a/modules/dev-test-lab/labs/policysets/policies/main.bicep b/modules/dev-test-lab/lab/policysets/policies/main.bicep similarity index 100% rename from modules/dev-test-lab/labs/policysets/policies/main.bicep rename to modules/dev-test-lab/lab/policysets/policies/main.bicep diff --git a/modules/dev-test-lab/labs/policysets/policies/main.json b/modules/dev-test-lab/lab/policysets/policies/main.json similarity index 100% rename from modules/dev-test-lab/labs/policysets/policies/main.json rename to modules/dev-test-lab/lab/policysets/policies/main.json diff --git a/modules/dev-test-lab/labs/policysets/policies/version.json b/modules/dev-test-lab/lab/policysets/policies/version.json similarity index 100% rename from modules/dev-test-lab/labs/policysets/policies/version.json rename to modules/dev-test-lab/lab/policysets/policies/version.json diff --git a/modules/dev-test-lab/labs/schedules/README.md b/modules/dev-test-lab/lab/schedules/README.md similarity index 100% rename from modules/dev-test-lab/labs/schedules/README.md rename to modules/dev-test-lab/lab/schedules/README.md diff --git a/modules/dev-test-lab/labs/schedules/main.bicep b/modules/dev-test-lab/lab/schedules/main.bicep similarity index 100% rename from modules/dev-test-lab/labs/schedules/main.bicep rename to modules/dev-test-lab/lab/schedules/main.bicep diff --git a/modules/dev-test-lab/labs/schedules/main.json b/modules/dev-test-lab/lab/schedules/main.json similarity index 100% rename from modules/dev-test-lab/labs/schedules/main.json rename to modules/dev-test-lab/lab/schedules/main.json diff --git a/modules/dev-test-lab/labs/schedules/version.json b/modules/dev-test-lab/lab/schedules/version.json similarity index 100% rename from modules/dev-test-lab/labs/schedules/version.json rename to modules/dev-test-lab/lab/schedules/version.json diff --git a/modules/dev-test-lab/labs/version.json b/modules/dev-test-lab/lab/version.json similarity index 100% rename from modules/dev-test-lab/labs/version.json rename to modules/dev-test-lab/lab/version.json diff --git a/modules/dev-test-lab/labs/virtualnetworks/README.md b/modules/dev-test-lab/lab/virtualnetworks/README.md similarity index 100% rename from modules/dev-test-lab/labs/virtualnetworks/README.md rename to modules/dev-test-lab/lab/virtualnetworks/README.md diff --git a/modules/dev-test-lab/labs/virtualnetworks/main.bicep b/modules/dev-test-lab/lab/virtualnetworks/main.bicep similarity index 100% rename from modules/dev-test-lab/labs/virtualnetworks/main.bicep rename to modules/dev-test-lab/lab/virtualnetworks/main.bicep diff --git a/modules/dev-test-lab/labs/virtualnetworks/main.json b/modules/dev-test-lab/lab/virtualnetworks/main.json similarity index 100% rename from modules/dev-test-lab/labs/virtualnetworks/main.json rename to modules/dev-test-lab/lab/virtualnetworks/main.json diff --git a/modules/dev-test-lab/labs/virtualnetworks/version.json b/modules/dev-test-lab/lab/virtualnetworks/version.json similarity index 100% rename from modules/dev-test-lab/labs/virtualnetworks/version.json rename to modules/dev-test-lab/lab/virtualnetworks/version.json diff --git a/modules/digital-twins/digital-twins-instances/.bicep/nested_roleAssignments.bicep b/modules/digital-twins/digital-twins-instance/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/digital-twins/digital-twins-instances/.bicep/nested_roleAssignments.bicep rename to modules/digital-twins/digital-twins-instance/.bicep/nested_roleAssignments.bicep diff --git a/modules/digital-twins/digital-twins-instances/.test/common/dependencies.bicep b/modules/digital-twins/digital-twins-instance/.test/common/dependencies.bicep similarity index 100% rename from modules/digital-twins/digital-twins-instances/.test/common/dependencies.bicep rename to modules/digital-twins/digital-twins-instance/.test/common/dependencies.bicep diff --git a/modules/digital-twins/digital-twins-instances/.test/common/main.test.bicep b/modules/digital-twins/digital-twins-instance/.test/common/main.test.bicep similarity index 100% rename from modules/digital-twins/digital-twins-instances/.test/common/main.test.bicep rename to modules/digital-twins/digital-twins-instance/.test/common/main.test.bicep diff --git a/modules/digital-twins/digital-twins-instances/.test/main.test.bicep b/modules/digital-twins/digital-twins-instance/.test/main.test.bicep similarity index 100% rename from modules/digital-twins/digital-twins-instances/.test/main.test.bicep rename to modules/digital-twins/digital-twins-instance/.test/main.test.bicep diff --git a/modules/digital-twins/digital-twins-instances/.test/min/main.test.bicep b/modules/digital-twins/digital-twins-instance/.test/min/main.test.bicep similarity index 100% rename from modules/digital-twins/digital-twins-instances/.test/min/main.test.bicep rename to modules/digital-twins/digital-twins-instance/.test/min/main.test.bicep diff --git a/modules/digital-twins/digital-twins-instances/README.md b/modules/digital-twins/digital-twins-instance/README.md similarity index 99% rename from modules/digital-twins/digital-twins-instances/README.md rename to modules/digital-twins/digital-twins-instance/README.md index 479013df65..4156ded06c 100644 --- a/modules/digital-twins/digital-twins-instances/README.md +++ b/modules/digital-twins/digital-twins-instance/README.md @@ -450,7 +450,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module digitalTwinsInstances './digital-twins/digital-twins-instances/main.bicep' = { +module digitalTwinsInstances './digital-twins/digital-twins-instance/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dtdticom' params: { // Required parameters @@ -619,7 +619,7 @@ module digitalTwinsInstances './digital-twins/digital-twins-instances/main.bicep via Bicep module ```bicep -module digitalTwinsInstances './digital-twins/digital-twins-instances/main.bicep' = { +module digitalTwinsInstances './digital-twins/digital-twins-instance/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dtdtimin' params: { // Required parameters diff --git a/modules/digital-twins/digital-twins-instances/endpoints--event-grid/README.md b/modules/digital-twins/digital-twins-instance/endpoints--event-grid/README.md similarity index 100% rename from modules/digital-twins/digital-twins-instances/endpoints--event-grid/README.md rename to modules/digital-twins/digital-twins-instance/endpoints--event-grid/README.md diff --git a/modules/digital-twins/digital-twins-instances/endpoints--event-grid/main.bicep b/modules/digital-twins/digital-twins-instance/endpoints--event-grid/main.bicep similarity index 100% rename from modules/digital-twins/digital-twins-instances/endpoints--event-grid/main.bicep rename to modules/digital-twins/digital-twins-instance/endpoints--event-grid/main.bicep diff --git a/modules/digital-twins/digital-twins-instances/endpoints--event-grid/main.json b/modules/digital-twins/digital-twins-instance/endpoints--event-grid/main.json similarity index 100% rename from modules/digital-twins/digital-twins-instances/endpoints--event-grid/main.json rename to modules/digital-twins/digital-twins-instance/endpoints--event-grid/main.json diff --git a/modules/digital-twins/digital-twins-instances/endpoints--event-grid/version.json b/modules/digital-twins/digital-twins-instance/endpoints--event-grid/version.json similarity index 100% rename from modules/digital-twins/digital-twins-instances/endpoints--event-grid/version.json rename to modules/digital-twins/digital-twins-instance/endpoints--event-grid/version.json diff --git a/modules/digital-twins/digital-twins-instances/endpoints--event-hub/README.md b/modules/digital-twins/digital-twins-instance/endpoints--event-hub/README.md similarity index 100% rename from modules/digital-twins/digital-twins-instances/endpoints--event-hub/README.md rename to modules/digital-twins/digital-twins-instance/endpoints--event-hub/README.md diff --git a/modules/digital-twins/digital-twins-instances/endpoints--event-hub/main.bicep b/modules/digital-twins/digital-twins-instance/endpoints--event-hub/main.bicep similarity index 100% rename from modules/digital-twins/digital-twins-instances/endpoints--event-hub/main.bicep rename to modules/digital-twins/digital-twins-instance/endpoints--event-hub/main.bicep diff --git a/modules/digital-twins/digital-twins-instances/endpoints--event-hub/main.json b/modules/digital-twins/digital-twins-instance/endpoints--event-hub/main.json similarity index 100% rename from modules/digital-twins/digital-twins-instances/endpoints--event-hub/main.json rename to modules/digital-twins/digital-twins-instance/endpoints--event-hub/main.json diff --git a/modules/digital-twins/digital-twins-instances/endpoints--event-hub/version.json b/modules/digital-twins/digital-twins-instance/endpoints--event-hub/version.json similarity index 100% rename from modules/digital-twins/digital-twins-instances/endpoints--event-hub/version.json rename to modules/digital-twins/digital-twins-instance/endpoints--event-hub/version.json diff --git a/modules/digital-twins/digital-twins-instances/endpoints--service-bus/README.md b/modules/digital-twins/digital-twins-instance/endpoints--service-bus/README.md similarity index 100% rename from modules/digital-twins/digital-twins-instances/endpoints--service-bus/README.md rename to modules/digital-twins/digital-twins-instance/endpoints--service-bus/README.md diff --git a/modules/digital-twins/digital-twins-instances/endpoints--service-bus/main.bicep b/modules/digital-twins/digital-twins-instance/endpoints--service-bus/main.bicep similarity index 100% rename from modules/digital-twins/digital-twins-instances/endpoints--service-bus/main.bicep rename to modules/digital-twins/digital-twins-instance/endpoints--service-bus/main.bicep diff --git a/modules/digital-twins/digital-twins-instances/endpoints--service-bus/main.json b/modules/digital-twins/digital-twins-instance/endpoints--service-bus/main.json similarity index 100% rename from modules/digital-twins/digital-twins-instances/endpoints--service-bus/main.json rename to modules/digital-twins/digital-twins-instance/endpoints--service-bus/main.json diff --git a/modules/digital-twins/digital-twins-instances/endpoints--service-bus/version.json b/modules/digital-twins/digital-twins-instance/endpoints--service-bus/version.json similarity index 100% rename from modules/digital-twins/digital-twins-instances/endpoints--service-bus/version.json rename to modules/digital-twins/digital-twins-instance/endpoints--service-bus/version.json diff --git a/modules/digital-twins/digital-twins-instances/main.bicep b/modules/digital-twins/digital-twins-instance/main.bicep similarity index 99% rename from modules/digital-twins/digital-twins-instances/main.bicep rename to modules/digital-twins/digital-twins-instance/main.bicep index c2611348d7..33d4404a87 100644 --- a/modules/digital-twins/digital-twins-instances/main.bicep +++ b/modules/digital-twins/digital-twins-instance/main.bicep @@ -206,7 +206,7 @@ module digitalTwinsInstance_serviceBusEndpoint 'endpoints--service-bus/main.bice } } -module digitalTwinsInstance_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module digitalTwinsInstance_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-digitalTwinsInstance-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/digital-twins/digital-twins-instances/main.json b/modules/digital-twins/digital-twins-instance/main.json similarity index 100% rename from modules/digital-twins/digital-twins-instances/main.json rename to modules/digital-twins/digital-twins-instance/main.json diff --git a/modules/digital-twins/digital-twins-instances/version.json b/modules/digital-twins/digital-twins-instance/version.json similarity index 100% rename from modules/digital-twins/digital-twins-instances/version.json rename to modules/digital-twins/digital-twins-instance/version.json diff --git a/modules/document-db/database-accounts/.bicep/nested_roleAssignments.bicep b/modules/document-db/database-account/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/document-db/database-accounts/.bicep/nested_roleAssignments.bicep rename to modules/document-db/database-account/.bicep/nested_roleAssignments.bicep diff --git a/modules/document-db/database-accounts/.test/gremlindb/dependencies.bicep b/modules/document-db/database-account/.test/gremlindb/dependencies.bicep similarity index 100% rename from modules/document-db/database-accounts/.test/gremlindb/dependencies.bicep rename to modules/document-db/database-account/.test/gremlindb/dependencies.bicep diff --git a/modules/document-db/database-accounts/.test/gremlindb/main.test.bicep b/modules/document-db/database-account/.test/gremlindb/main.test.bicep similarity index 100% rename from modules/document-db/database-accounts/.test/gremlindb/main.test.bicep rename to modules/document-db/database-account/.test/gremlindb/main.test.bicep diff --git a/modules/document-db/database-accounts/.test/main.test.bicep b/modules/document-db/database-account/.test/main.test.bicep similarity index 100% rename from modules/document-db/database-accounts/.test/main.test.bicep rename to modules/document-db/database-account/.test/main.test.bicep diff --git a/modules/document-db/database-accounts/.test/mongodb/dependencies.bicep b/modules/document-db/database-account/.test/mongodb/dependencies.bicep similarity index 100% rename from modules/document-db/database-accounts/.test/mongodb/dependencies.bicep rename to modules/document-db/database-account/.test/mongodb/dependencies.bicep diff --git a/modules/document-db/database-accounts/.test/mongodb/main.test.bicep b/modules/document-db/database-account/.test/mongodb/main.test.bicep similarity index 100% rename from modules/document-db/database-accounts/.test/mongodb/main.test.bicep rename to modules/document-db/database-account/.test/mongodb/main.test.bicep diff --git a/modules/document-db/database-accounts/.test/plain/dependencies.bicep b/modules/document-db/database-account/.test/plain/dependencies.bicep similarity index 100% rename from modules/document-db/database-accounts/.test/plain/dependencies.bicep rename to modules/document-db/database-account/.test/plain/dependencies.bicep diff --git a/modules/document-db/database-accounts/.test/plain/main.test.bicep b/modules/document-db/database-account/.test/plain/main.test.bicep similarity index 100% rename from modules/document-db/database-accounts/.test/plain/main.test.bicep rename to modules/document-db/database-account/.test/plain/main.test.bicep diff --git a/modules/document-db/database-accounts/.test/sqldb/dependencies.bicep b/modules/document-db/database-account/.test/sqldb/dependencies.bicep similarity index 100% rename from modules/document-db/database-accounts/.test/sqldb/dependencies.bicep rename to modules/document-db/database-account/.test/sqldb/dependencies.bicep diff --git a/modules/document-db/database-accounts/.test/sqldb/main.test.bicep b/modules/document-db/database-account/.test/sqldb/main.test.bicep similarity index 100% rename from modules/document-db/database-accounts/.test/sqldb/main.test.bicep rename to modules/document-db/database-account/.test/sqldb/main.test.bicep diff --git a/modules/document-db/database-accounts/README.md b/modules/document-db/database-account/README.md similarity index 99% rename from modules/document-db/database-accounts/README.md rename to modules/document-db/database-account/README.md index ad29146b6e..f5909a55b2 100644 --- a/modules/document-db/database-accounts/README.md +++ b/modules/document-db/database-account/README.md @@ -659,7 +659,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module databaseAccounts './document-db/database-accounts/main.bicep' = { +module databaseAccounts './document-db/database-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dddagrm' params: { // Required parameters @@ -894,7 +894,7 @@ module databaseAccounts './document-db/database-accounts/main.bicep' = { via Bicep module ```bicep -module databaseAccounts './document-db/database-accounts/main.bicep' = { +module databaseAccounts './document-db/database-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dddamng' params: { // Required parameters @@ -1393,7 +1393,7 @@ module databaseAccounts './document-db/database-accounts/main.bicep' = { via Bicep module ```bicep -module databaseAccounts './document-db/database-accounts/main.bicep' = { +module databaseAccounts './document-db/database-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dddapln' params: { // Required parameters @@ -1518,7 +1518,7 @@ module databaseAccounts './document-db/database-accounts/main.bicep' = { via Bicep module ```bicep -module databaseAccounts './document-db/database-accounts/main.bicep' = { +module databaseAccounts './document-db/database-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-dddasql' params: { // Required parameters diff --git a/modules/document-db/database-accounts/gremlin-databases/README.md b/modules/document-db/database-account/gremlin-databases/README.md similarity index 100% rename from modules/document-db/database-accounts/gremlin-databases/README.md rename to modules/document-db/database-account/gremlin-databases/README.md diff --git a/modules/document-db/database-accounts/gremlin-databases/graphs/README.md b/modules/document-db/database-account/gremlin-databases/graphs/README.md similarity index 100% rename from modules/document-db/database-accounts/gremlin-databases/graphs/README.md rename to modules/document-db/database-account/gremlin-databases/graphs/README.md diff --git a/modules/document-db/database-accounts/gremlin-databases/graphs/main.bicep b/modules/document-db/database-account/gremlin-databases/graphs/main.bicep similarity index 100% rename from modules/document-db/database-accounts/gremlin-databases/graphs/main.bicep rename to modules/document-db/database-account/gremlin-databases/graphs/main.bicep diff --git a/modules/document-db/database-accounts/gremlin-databases/graphs/main.json b/modules/document-db/database-account/gremlin-databases/graphs/main.json similarity index 100% rename from modules/document-db/database-accounts/gremlin-databases/graphs/main.json rename to modules/document-db/database-account/gremlin-databases/graphs/main.json diff --git a/modules/document-db/database-accounts/gremlin-databases/graphs/version.json b/modules/document-db/database-account/gremlin-databases/graphs/version.json similarity index 100% rename from modules/document-db/database-accounts/gremlin-databases/graphs/version.json rename to modules/document-db/database-account/gremlin-databases/graphs/version.json diff --git a/modules/document-db/database-accounts/gremlin-databases/main.bicep b/modules/document-db/database-account/gremlin-databases/main.bicep similarity index 97% rename from modules/document-db/database-accounts/gremlin-databases/main.bicep rename to modules/document-db/database-account/gremlin-databases/main.bicep index 4d1fc1c156..82f0325cbc 100644 --- a/modules/document-db/database-accounts/gremlin-databases/main.bicep +++ b/modules/document-db/database-account/gremlin-databases/main.bicep @@ -72,7 +72,7 @@ resource gremlinDatabase 'Microsoft.DocumentDB/databaseAccounts/gremlinDatabases } } -module gremlinDatabase_gremlinGraphs 'graphs/main.bicep' = [for graph in graphs: { +module gremlinDatabase_gremlinGraphs 'graph/main.bicep' = [for graph in graphs: { name: '${uniqueString(deployment().name, gremlinDatabase.name)}-gremlindb-${graph.name}' params: { name: graph.name diff --git a/modules/document-db/database-accounts/gremlin-databases/main.json b/modules/document-db/database-account/gremlin-databases/main.json similarity index 100% rename from modules/document-db/database-accounts/gremlin-databases/main.json rename to modules/document-db/database-account/gremlin-databases/main.json diff --git a/modules/document-db/database-accounts/gremlin-databases/version.json b/modules/document-db/database-account/gremlin-databases/version.json similarity index 100% rename from modules/document-db/database-accounts/gremlin-databases/version.json rename to modules/document-db/database-account/gremlin-databases/version.json diff --git a/modules/document-db/database-accounts/main.bicep b/modules/document-db/database-account/main.bicep similarity index 97% rename from modules/document-db/database-accounts/main.bicep rename to modules/document-db/database-account/main.bicep index 01115a9e6c..c4e5faface 100644 --- a/modules/document-db/database-accounts/main.bicep +++ b/modules/document-db/database-account/main.bicep @@ -336,7 +336,7 @@ module databaseAccount_roleAssignments '.bicep/nested_roleAssignments.bicep' = [ } }] -module databaseAccount_sqlDatabases 'sql-databases/main.bicep' = [for sqlDatabase in sqlDatabases: { +module databaseAccount_sqlDatabases 'sql-database/main.bicep' = [for sqlDatabase in sqlDatabases: { name: '${uniqueString(deployment().name, location)}-sqldb-${sqlDatabase.name}' params: { databaseAccountName: databaseAccount.name @@ -348,7 +348,7 @@ module databaseAccount_sqlDatabases 'sql-databases/main.bicep' = [for sqlDatabas } }] -module databaseAccount_mongodbDatabases 'mongodb-databases/main.bicep' = [for mongodbDatabase in mongodbDatabases: { +module databaseAccount_mongodbDatabases 'mongodb-database/main.bicep' = [for mongodbDatabase in mongodbDatabases: { name: '${uniqueString(deployment().name, location)}-mongodb-${mongodbDatabase.name}' params: { databaseAccountName: databaseAccount.name @@ -358,7 +358,7 @@ module databaseAccount_mongodbDatabases 'mongodb-databases/main.bicep' = [for mo } }] -module databaseAccount_gremlinDatabases 'gremlin-databases/main.bicep' = [for gremlinDatabase in gremlinDatabases: { +module databaseAccount_gremlinDatabases 'gremlin-database/main.bicep' = [for gremlinDatabase in gremlinDatabases: { name: '${uniqueString(deployment().name, location)}-gremlin-${gremlinDatabase.name}' params: { databaseAccountName: databaseAccount.name @@ -368,7 +368,7 @@ module databaseAccount_gremlinDatabases 'gremlin-databases/main.bicep' = [for gr } }] -module databaseAccount_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module databaseAccount_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-CosmosDB-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/document-db/database-accounts/main.json b/modules/document-db/database-account/main.json similarity index 100% rename from modules/document-db/database-accounts/main.json rename to modules/document-db/database-account/main.json diff --git a/modules/document-db/database-accounts/mongodb-databases/README.md b/modules/document-db/database-account/mongodb-databases/README.md similarity index 100% rename from modules/document-db/database-accounts/mongodb-databases/README.md rename to modules/document-db/database-account/mongodb-databases/README.md diff --git a/modules/document-db/database-accounts/mongodb-databases/collections/README.md b/modules/document-db/database-account/mongodb-databases/collections/README.md similarity index 100% rename from modules/document-db/database-accounts/mongodb-databases/collections/README.md rename to modules/document-db/database-account/mongodb-databases/collections/README.md diff --git a/modules/document-db/database-accounts/mongodb-databases/collections/main.bicep b/modules/document-db/database-account/mongodb-databases/collections/main.bicep similarity index 100% rename from modules/document-db/database-accounts/mongodb-databases/collections/main.bicep rename to modules/document-db/database-account/mongodb-databases/collections/main.bicep diff --git a/modules/document-db/database-accounts/mongodb-databases/collections/main.json b/modules/document-db/database-account/mongodb-databases/collections/main.json similarity index 100% rename from modules/document-db/database-accounts/mongodb-databases/collections/main.json rename to modules/document-db/database-account/mongodb-databases/collections/main.json diff --git a/modules/document-db/database-accounts/mongodb-databases/collections/version.json b/modules/document-db/database-account/mongodb-databases/collections/version.json similarity index 100% rename from modules/document-db/database-accounts/mongodb-databases/collections/version.json rename to modules/document-db/database-account/mongodb-databases/collections/version.json diff --git a/modules/document-db/database-accounts/mongodb-databases/main.bicep b/modules/document-db/database-account/mongodb-databases/main.bicep similarity index 96% rename from modules/document-db/database-accounts/mongodb-databases/main.bicep rename to modules/document-db/database-account/mongodb-databases/main.bicep index da5780ca6d..4598238f0d 100644 --- a/modules/document-db/database-accounts/mongodb-databases/main.bicep +++ b/modules/document-db/database-account/mongodb-databases/main.bicep @@ -52,7 +52,7 @@ resource mongodbDatabase 'Microsoft.DocumentDB/databaseAccounts/mongodbDatabases } } -module mongodbDatabase_collections 'collections/main.bicep' = [for collection in collections: { +module mongodbDatabase_collections 'collection/main.bicep' = [for collection in collections: { name: '${uniqueString(deployment().name, mongodbDatabase.name)}-collection-${collection.name}' params: { databaseAccountName: databaseAccountName diff --git a/modules/document-db/database-accounts/mongodb-databases/main.json b/modules/document-db/database-account/mongodb-databases/main.json similarity index 100% rename from modules/document-db/database-accounts/mongodb-databases/main.json rename to modules/document-db/database-account/mongodb-databases/main.json diff --git a/modules/document-db/database-accounts/mongodb-databases/version.json b/modules/document-db/database-account/mongodb-databases/version.json similarity index 100% rename from modules/document-db/database-accounts/mongodb-databases/version.json rename to modules/document-db/database-account/mongodb-databases/version.json diff --git a/modules/document-db/database-accounts/sql-databases/README.md b/modules/document-db/database-account/sql-databases/README.md similarity index 100% rename from modules/document-db/database-accounts/sql-databases/README.md rename to modules/document-db/database-account/sql-databases/README.md diff --git a/modules/document-db/database-accounts/sql-databases/containers/README.md b/modules/document-db/database-account/sql-databases/containers/README.md similarity index 100% rename from modules/document-db/database-accounts/sql-databases/containers/README.md rename to modules/document-db/database-account/sql-databases/containers/README.md diff --git a/modules/document-db/database-accounts/sql-databases/containers/main.bicep b/modules/document-db/database-account/sql-databases/containers/main.bicep similarity index 100% rename from modules/document-db/database-accounts/sql-databases/containers/main.bicep rename to modules/document-db/database-account/sql-databases/containers/main.bicep diff --git a/modules/document-db/database-accounts/sql-databases/containers/main.json b/modules/document-db/database-account/sql-databases/containers/main.json similarity index 100% rename from modules/document-db/database-accounts/sql-databases/containers/main.json rename to modules/document-db/database-account/sql-databases/containers/main.json diff --git a/modules/document-db/database-accounts/sql-databases/containers/version.json b/modules/document-db/database-account/sql-databases/containers/version.json similarity index 100% rename from modules/document-db/database-accounts/sql-databases/containers/version.json rename to modules/document-db/database-account/sql-databases/containers/version.json diff --git a/modules/document-db/database-accounts/sql-databases/main.bicep b/modules/document-db/database-account/sql-databases/main.bicep similarity index 98% rename from modules/document-db/database-accounts/sql-databases/main.bicep rename to modules/document-db/database-account/sql-databases/main.bicep index f525e01be5..dd4e23c5f6 100644 --- a/modules/document-db/database-accounts/sql-databases/main.bicep +++ b/modules/document-db/database-account/sql-databases/main.bicep @@ -58,7 +58,7 @@ resource sqlDatabase 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2023-04 } } -module container 'containers/main.bicep' = [for container in containers: { +module container 'container/main.bicep' = [for container in containers: { name: '${uniqueString(deployment().name, sqlDatabase.name)}-sqldb-${container.name}' params: { databaseAccountName: databaseAccountName diff --git a/modules/document-db/database-accounts/sql-databases/main.json b/modules/document-db/database-account/sql-databases/main.json similarity index 100% rename from modules/document-db/database-accounts/sql-databases/main.json rename to modules/document-db/database-account/sql-databases/main.json diff --git a/modules/document-db/database-accounts/sql-databases/version.json b/modules/document-db/database-account/sql-databases/version.json similarity index 100% rename from modules/document-db/database-accounts/sql-databases/version.json rename to modules/document-db/database-account/sql-databases/version.json diff --git a/modules/document-db/database-accounts/version.json b/modules/document-db/database-account/version.json similarity index 100% rename from modules/document-db/database-accounts/version.json rename to modules/document-db/database-account/version.json diff --git a/modules/event-grid/domains/.bicep/nested_roleAssignments.bicep b/modules/event-grid/domain/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/event-grid/domains/.bicep/nested_roleAssignments.bicep rename to modules/event-grid/domain/.bicep/nested_roleAssignments.bicep diff --git a/modules/event-grid/domains/.test/common/dependencies.bicep b/modules/event-grid/domain/.test/common/dependencies.bicep similarity index 100% rename from modules/event-grid/domains/.test/common/dependencies.bicep rename to modules/event-grid/domain/.test/common/dependencies.bicep diff --git a/modules/event-grid/domains/.test/common/main.test.bicep b/modules/event-grid/domain/.test/common/main.test.bicep similarity index 100% rename from modules/event-grid/domains/.test/common/main.test.bicep rename to modules/event-grid/domain/.test/common/main.test.bicep diff --git a/modules/event-grid/domains/.test/main.test.bicep b/modules/event-grid/domain/.test/main.test.bicep similarity index 100% rename from modules/event-grid/domains/.test/main.test.bicep rename to modules/event-grid/domain/.test/main.test.bicep diff --git a/modules/event-grid/domains/.test/min/main.test.bicep b/modules/event-grid/domain/.test/min/main.test.bicep similarity index 100% rename from modules/event-grid/domains/.test/min/main.test.bicep rename to modules/event-grid/domain/.test/min/main.test.bicep diff --git a/modules/event-grid/domains/.test/pe/dependencies.bicep b/modules/event-grid/domain/.test/pe/dependencies.bicep similarity index 100% rename from modules/event-grid/domains/.test/pe/dependencies.bicep rename to modules/event-grid/domain/.test/pe/dependencies.bicep diff --git a/modules/event-grid/domains/.test/pe/main.test.bicep b/modules/event-grid/domain/.test/pe/main.test.bicep similarity index 100% rename from modules/event-grid/domains/.test/pe/main.test.bicep rename to modules/event-grid/domain/.test/pe/main.test.bicep diff --git a/modules/event-grid/domains/README.md b/modules/event-grid/domain/README.md similarity index 99% rename from modules/event-grid/domains/README.md rename to modules/event-grid/domain/README.md index a148845b92..e3b91651ba 100644 --- a/modules/event-grid/domains/README.md +++ b/modules/event-grid/domain/README.md @@ -286,7 +286,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module domains './event-grid/domains/main.bicep' = { +module domains './event-grid/domain/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-egdcom' params: { // Required parameters @@ -439,7 +439,7 @@ module domains './event-grid/domains/main.bicep' = { via Bicep module ```bicep -module domains './event-grid/domains/main.bicep' = { +module domains './event-grid/domain/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-egdmin' params: { // Required parameters @@ -484,7 +484,7 @@ module domains './event-grid/domains/main.bicep' = { via Bicep module ```bicep -module domains './event-grid/domains/main.bicep' = { +module domains './event-grid/domain/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-egdpe' params: { // Required parameters diff --git a/modules/event-grid/domains/main.bicep b/modules/event-grid/domain/main.bicep similarity index 97% rename from modules/event-grid/domains/main.bicep rename to modules/event-grid/domain/main.bicep index a177b3765d..91dac314a3 100644 --- a/modules/event-grid/domains/main.bicep +++ b/modules/event-grid/domain/main.bicep @@ -143,7 +143,7 @@ resource domain 'Microsoft.EventGrid/domains@2022-06-15' = { } } -module domain_topics 'topics/main.bicep' = [for (topic, index) in topics: { +module domain_topics 'topic/main.bicep' = [for (topic, index) in topics: { name: '${uniqueString(deployment().name, location)}-topics-${index}' params: { domainName: domain.name @@ -175,7 +175,7 @@ resource domain_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@2021-0 scope: domain } -module domain_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module domain_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-Domain-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/event-grid/domains/main.json b/modules/event-grid/domain/main.json similarity index 100% rename from modules/event-grid/domains/main.json rename to modules/event-grid/domain/main.json diff --git a/modules/event-grid/domains/topics/README.md b/modules/event-grid/domain/topics/README.md similarity index 100% rename from modules/event-grid/domains/topics/README.md rename to modules/event-grid/domain/topics/README.md diff --git a/modules/event-grid/domains/topics/main.bicep b/modules/event-grid/domain/topics/main.bicep similarity index 100% rename from modules/event-grid/domains/topics/main.bicep rename to modules/event-grid/domain/topics/main.bicep diff --git a/modules/event-grid/domains/topics/main.json b/modules/event-grid/domain/topics/main.json similarity index 100% rename from modules/event-grid/domains/topics/main.json rename to modules/event-grid/domain/topics/main.json diff --git a/modules/event-grid/domains/topics/version.json b/modules/event-grid/domain/topics/version.json similarity index 100% rename from modules/event-grid/domains/topics/version.json rename to modules/event-grid/domain/topics/version.json diff --git a/modules/event-grid/domains/version.json b/modules/event-grid/domain/version.json similarity index 100% rename from modules/event-grid/domains/version.json rename to modules/event-grid/domain/version.json diff --git a/modules/event-grid/system-topics/.bicep/nested_roleAssignments.bicep b/modules/event-grid/system-topic/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/event-grid/system-topics/.bicep/nested_roleAssignments.bicep rename to modules/event-grid/system-topic/.bicep/nested_roleAssignments.bicep diff --git a/modules/event-grid/system-topics/.test/common/dependencies.bicep b/modules/event-grid/system-topic/.test/common/dependencies.bicep similarity index 100% rename from modules/event-grid/system-topics/.test/common/dependencies.bicep rename to modules/event-grid/system-topic/.test/common/dependencies.bicep diff --git a/modules/event-grid/system-topics/.test/common/main.test.bicep b/modules/event-grid/system-topic/.test/common/main.test.bicep similarity index 100% rename from modules/event-grid/system-topics/.test/common/main.test.bicep rename to modules/event-grid/system-topic/.test/common/main.test.bicep diff --git a/modules/event-grid/system-topics/.test/main.test.bicep b/modules/event-grid/system-topic/.test/main.test.bicep similarity index 100% rename from modules/event-grid/system-topics/.test/main.test.bicep rename to modules/event-grid/system-topic/.test/main.test.bicep diff --git a/modules/event-grid/system-topics/.test/min/dependencies.bicep b/modules/event-grid/system-topic/.test/min/dependencies.bicep similarity index 100% rename from modules/event-grid/system-topics/.test/min/dependencies.bicep rename to modules/event-grid/system-topic/.test/min/dependencies.bicep diff --git a/modules/event-grid/system-topics/.test/min/main.test.bicep b/modules/event-grid/system-topic/.test/min/main.test.bicep similarity index 100% rename from modules/event-grid/system-topics/.test/min/main.test.bicep rename to modules/event-grid/system-topic/.test/min/main.test.bicep diff --git a/modules/event-grid/system-topics/README.md b/modules/event-grid/system-topic/README.md similarity index 99% rename from modules/event-grid/system-topics/README.md rename to modules/event-grid/system-topic/README.md index 76a1b07a74..b03547909d 100644 --- a/modules/event-grid/system-topics/README.md +++ b/modules/event-grid/system-topic/README.md @@ -286,7 +286,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module systemTopics './event-grid/system-topics/main.bicep' = { +module systemTopics './event-grid/system-topic/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-egstcom' params: { // Required parameters @@ -443,7 +443,7 @@ module systemTopics './event-grid/system-topics/main.bicep' = { via Bicep module ```bicep -module systemTopics './event-grid/system-topics/main.bicep' = { +module systemTopics './event-grid/system-topic/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-egstmin' params: { // Required parameters diff --git a/modules/event-grid/system-topics/eventSubscriptions/README.md b/modules/event-grid/system-topic/eventSubscriptions/README.md similarity index 100% rename from modules/event-grid/system-topics/eventSubscriptions/README.md rename to modules/event-grid/system-topic/eventSubscriptions/README.md diff --git a/modules/event-grid/system-topics/eventSubscriptions/main.bicep b/modules/event-grid/system-topic/eventSubscriptions/main.bicep similarity index 100% rename from modules/event-grid/system-topics/eventSubscriptions/main.bicep rename to modules/event-grid/system-topic/eventSubscriptions/main.bicep diff --git a/modules/event-grid/system-topics/eventSubscriptions/main.json b/modules/event-grid/system-topic/eventSubscriptions/main.json similarity index 100% rename from modules/event-grid/system-topics/eventSubscriptions/main.json rename to modules/event-grid/system-topic/eventSubscriptions/main.json diff --git a/modules/event-grid/system-topics/eventSubscriptions/version.json b/modules/event-grid/system-topic/eventSubscriptions/version.json similarity index 100% rename from modules/event-grid/system-topics/eventSubscriptions/version.json rename to modules/event-grid/system-topic/eventSubscriptions/version.json diff --git a/modules/event-grid/system-topics/main.bicep b/modules/event-grid/system-topic/main.bicep similarity index 98% rename from modules/event-grid/system-topics/main.bicep rename to modules/event-grid/system-topic/main.bicep index 272985e335..f2ad411a86 100644 --- a/modules/event-grid/system-topics/main.bicep +++ b/modules/event-grid/system-topic/main.bicep @@ -139,7 +139,7 @@ resource systemTopic 'Microsoft.EventGrid/systemTopics@2021-12-01' = { } // Event subscriptions -module systemTopics_eventSubscriptions 'eventSubscriptions/main.bicep' = [for (eventSubscription, index) in eventSubscriptions: { +module systemTopics_eventSubscriptions 'eventSubscription/main.bicep' = [for (eventSubscription, index) in eventSubscriptions: { name: '${uniqueString(deployment().name, location)}-EventGrid-SystemTopics-EventSubscriptions-${index}' params: { destination: eventSubscription.destination diff --git a/modules/event-grid/system-topics/main.json b/modules/event-grid/system-topic/main.json similarity index 100% rename from modules/event-grid/system-topics/main.json rename to modules/event-grid/system-topic/main.json diff --git a/modules/event-grid/system-topics/version.json b/modules/event-grid/system-topic/version.json similarity index 100% rename from modules/event-grid/system-topics/version.json rename to modules/event-grid/system-topic/version.json diff --git a/modules/event-grid/topics/.bicep/nested_roleAssignments.bicep b/modules/event-grid/topic/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/event-grid/topics/.bicep/nested_roleAssignments.bicep rename to modules/event-grid/topic/.bicep/nested_roleAssignments.bicep diff --git a/modules/event-grid/topics/.test/common/dependencies.bicep b/modules/event-grid/topic/.test/common/dependencies.bicep similarity index 100% rename from modules/event-grid/topics/.test/common/dependencies.bicep rename to modules/event-grid/topic/.test/common/dependencies.bicep diff --git a/modules/event-grid/topics/.test/common/main.test.bicep b/modules/event-grid/topic/.test/common/main.test.bicep similarity index 100% rename from modules/event-grid/topics/.test/common/main.test.bicep rename to modules/event-grid/topic/.test/common/main.test.bicep diff --git a/modules/event-grid/topics/.test/main.test.bicep b/modules/event-grid/topic/.test/main.test.bicep similarity index 100% rename from modules/event-grid/topics/.test/main.test.bicep rename to modules/event-grid/topic/.test/main.test.bicep diff --git a/modules/event-grid/topics/.test/min/main.test.bicep b/modules/event-grid/topic/.test/min/main.test.bicep similarity index 100% rename from modules/event-grid/topics/.test/min/main.test.bicep rename to modules/event-grid/topic/.test/min/main.test.bicep diff --git a/modules/event-grid/topics/.test/pe/dependencies.bicep b/modules/event-grid/topic/.test/pe/dependencies.bicep similarity index 100% rename from modules/event-grid/topics/.test/pe/dependencies.bicep rename to modules/event-grid/topic/.test/pe/dependencies.bicep diff --git a/modules/event-grid/topics/.test/pe/main.test.bicep b/modules/event-grid/topic/.test/pe/main.test.bicep similarity index 100% rename from modules/event-grid/topics/.test/pe/main.test.bicep rename to modules/event-grid/topic/.test/pe/main.test.bicep diff --git a/modules/event-grid/topics/README.md b/modules/event-grid/topic/README.md similarity index 99% rename from modules/event-grid/topics/README.md rename to modules/event-grid/topic/README.md index aa69becb1b..0db07fb12c 100644 --- a/modules/event-grid/topics/README.md +++ b/modules/event-grid/topic/README.md @@ -357,7 +357,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module topics './event-grid/topics/main.bicep' = { +module topics './event-grid/topic/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-egtcom' params: { // Required parameters @@ -552,7 +552,7 @@ module topics './event-grid/topics/main.bicep' = { via Bicep module ```bicep -module topics './event-grid/topics/main.bicep' = { +module topics './event-grid/topic/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-egtmin' params: { // Required parameters @@ -597,7 +597,7 @@ module topics './event-grid/topics/main.bicep' = { via Bicep module ```bicep -module topics './event-grid/topics/main.bicep' = { +module topics './event-grid/topic/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-egtpe' params: { // Required parameters diff --git a/modules/event-grid/topics/eventSubscriptions/README.md b/modules/event-grid/topic/eventSubscriptions/README.md similarity index 100% rename from modules/event-grid/topics/eventSubscriptions/README.md rename to modules/event-grid/topic/eventSubscriptions/README.md diff --git a/modules/event-grid/topics/eventSubscriptions/main.bicep b/modules/event-grid/topic/eventSubscriptions/main.bicep similarity index 100% rename from modules/event-grid/topics/eventSubscriptions/main.bicep rename to modules/event-grid/topic/eventSubscriptions/main.bicep diff --git a/modules/event-grid/topics/eventSubscriptions/main.json b/modules/event-grid/topic/eventSubscriptions/main.json similarity index 100% rename from modules/event-grid/topics/eventSubscriptions/main.json rename to modules/event-grid/topic/eventSubscriptions/main.json diff --git a/modules/event-grid/topics/eventSubscriptions/version.json b/modules/event-grid/topic/eventSubscriptions/version.json similarity index 100% rename from modules/event-grid/topics/eventSubscriptions/version.json rename to modules/event-grid/topic/eventSubscriptions/version.json diff --git a/modules/event-grid/topics/main.bicep b/modules/event-grid/topic/main.bicep similarity index 97% rename from modules/event-grid/topics/main.bicep rename to modules/event-grid/topic/main.bicep index a1faa3d101..a5dc2773ed 100644 --- a/modules/event-grid/topics/main.bicep +++ b/modules/event-grid/topic/main.bicep @@ -136,7 +136,7 @@ resource topic 'Microsoft.EventGrid/topics@2020-06-01' = { } // Event subscriptions -module topics_eventSubscriptions 'eventSubscriptions/main.bicep' = [for (eventSubscription, index) in eventSubscriptions: { +module topics_eventSubscriptions 'eventSubscription/main.bicep' = [for (eventSubscription, index) in eventSubscriptions: { name: '${uniqueString(deployment().name, location)}-EventGrid-Topics-EventSubscriptions-${index}' params: { destination: eventSubscription.destination @@ -177,7 +177,7 @@ resource topic_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@2021-05 scope: topic } -module topic_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module topic_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-Topic-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/event-grid/topics/main.json b/modules/event-grid/topic/main.json similarity index 100% rename from modules/event-grid/topics/main.json rename to modules/event-grid/topic/main.json diff --git a/modules/event-grid/topics/version.json b/modules/event-grid/topic/version.json similarity index 100% rename from modules/event-grid/topics/version.json rename to modules/event-grid/topic/version.json diff --git a/modules/event-hub/namespaces/.bicep/nested_roleAssignments.bicep b/modules/event-hub/namespace/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/event-hub/namespaces/.bicep/nested_roleAssignments.bicep rename to modules/event-hub/namespace/.bicep/nested_roleAssignments.bicep diff --git a/modules/event-hub/namespaces/.test/common/dependencies.bicep b/modules/event-hub/namespace/.test/common/dependencies.bicep similarity index 100% rename from modules/event-hub/namespaces/.test/common/dependencies.bicep rename to modules/event-hub/namespace/.test/common/dependencies.bicep diff --git a/modules/event-hub/namespaces/.test/common/main.test.bicep b/modules/event-hub/namespace/.test/common/main.test.bicep similarity index 100% rename from modules/event-hub/namespaces/.test/common/main.test.bicep rename to modules/event-hub/namespace/.test/common/main.test.bicep diff --git a/modules/event-hub/namespaces/.test/encr/dependencies.bicep b/modules/event-hub/namespace/.test/encr/dependencies.bicep similarity index 100% rename from modules/event-hub/namespaces/.test/encr/dependencies.bicep rename to modules/event-hub/namespace/.test/encr/dependencies.bicep diff --git a/modules/event-hub/namespaces/.test/encr/main.test.bicep b/modules/event-hub/namespace/.test/encr/main.test.bicep similarity index 100% rename from modules/event-hub/namespaces/.test/encr/main.test.bicep rename to modules/event-hub/namespace/.test/encr/main.test.bicep diff --git a/modules/event-hub/namespaces/.test/main.test.bicep b/modules/event-hub/namespace/.test/main.test.bicep similarity index 100% rename from modules/event-hub/namespaces/.test/main.test.bicep rename to modules/event-hub/namespace/.test/main.test.bicep diff --git a/modules/event-hub/namespaces/.test/min/main.test.bicep b/modules/event-hub/namespace/.test/min/main.test.bicep similarity index 100% rename from modules/event-hub/namespaces/.test/min/main.test.bicep rename to modules/event-hub/namespace/.test/min/main.test.bicep diff --git a/modules/event-hub/namespaces/.test/pe/dependencies.bicep b/modules/event-hub/namespace/.test/pe/dependencies.bicep similarity index 100% rename from modules/event-hub/namespaces/.test/pe/dependencies.bicep rename to modules/event-hub/namespace/.test/pe/dependencies.bicep diff --git a/modules/event-hub/namespaces/.test/pe/main.test.bicep b/modules/event-hub/namespace/.test/pe/main.test.bicep similarity index 100% rename from modules/event-hub/namespaces/.test/pe/main.test.bicep rename to modules/event-hub/namespace/.test/pe/main.test.bicep diff --git a/modules/event-hub/namespaces/README.md b/modules/event-hub/namespace/README.md similarity index 99% rename from modules/event-hub/namespaces/README.md rename to modules/event-hub/namespace/README.md index d82c8fe754..4a710dc8b8 100644 --- a/modules/event-hub/namespaces/README.md +++ b/modules/event-hub/namespace/README.md @@ -345,7 +345,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module namespaces './event-hub/namespaces/main.bicep' = { +module namespaces './event-hub/namespace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ehncom' params: { // Required parameters @@ -690,7 +690,7 @@ module namespaces './event-hub/namespaces/main.bicep' = { via Bicep module ```bicep -module namespaces './event-hub/namespaces/main.bicep' = { +module namespaces './event-hub/namespace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ehnenc' params: { // Required parameters @@ -781,7 +781,7 @@ module namespaces './event-hub/namespaces/main.bicep' = { via Bicep module ```bicep -module namespaces './event-hub/namespaces/main.bicep' = { +module namespaces './event-hub/namespace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ehnmin' params: { // Required parameters @@ -826,7 +826,7 @@ module namespaces './event-hub/namespaces/main.bicep' = { via Bicep module ```bicep -module namespaces './event-hub/namespaces/main.bicep' = { +module namespaces './event-hub/namespace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ehnpe' params: { // Required parameters diff --git a/modules/event-hub/namespaces/authorization-rules/README.md b/modules/event-hub/namespace/authorization-rules/README.md similarity index 100% rename from modules/event-hub/namespaces/authorization-rules/README.md rename to modules/event-hub/namespace/authorization-rules/README.md diff --git a/modules/event-hub/namespaces/authorization-rules/main.bicep b/modules/event-hub/namespace/authorization-rules/main.bicep similarity index 100% rename from modules/event-hub/namespaces/authorization-rules/main.bicep rename to modules/event-hub/namespace/authorization-rules/main.bicep diff --git a/modules/event-hub/namespaces/authorization-rules/main.json b/modules/event-hub/namespace/authorization-rules/main.json similarity index 100% rename from modules/event-hub/namespaces/authorization-rules/main.json rename to modules/event-hub/namespace/authorization-rules/main.json diff --git a/modules/event-hub/namespaces/authorization-rules/version.json b/modules/event-hub/namespace/authorization-rules/version.json similarity index 100% rename from modules/event-hub/namespaces/authorization-rules/version.json rename to modules/event-hub/namespace/authorization-rules/version.json diff --git a/modules/event-hub/namespaces/disaster-recovery-configs/README.md b/modules/event-hub/namespace/disaster-recovery-configs/README.md similarity index 100% rename from modules/event-hub/namespaces/disaster-recovery-configs/README.md rename to modules/event-hub/namespace/disaster-recovery-configs/README.md diff --git a/modules/event-hub/namespaces/disaster-recovery-configs/main.bicep b/modules/event-hub/namespace/disaster-recovery-configs/main.bicep similarity index 100% rename from modules/event-hub/namespaces/disaster-recovery-configs/main.bicep rename to modules/event-hub/namespace/disaster-recovery-configs/main.bicep diff --git a/modules/event-hub/namespaces/disaster-recovery-configs/main.json b/modules/event-hub/namespace/disaster-recovery-configs/main.json similarity index 100% rename from modules/event-hub/namespaces/disaster-recovery-configs/main.json rename to modules/event-hub/namespace/disaster-recovery-configs/main.json diff --git a/modules/event-hub/namespaces/disaster-recovery-configs/version.json b/modules/event-hub/namespace/disaster-recovery-configs/version.json similarity index 100% rename from modules/event-hub/namespaces/disaster-recovery-configs/version.json rename to modules/event-hub/namespace/disaster-recovery-configs/version.json diff --git a/modules/event-hub/namespaces/eventhubs/.bicep/nested_roleAssignments.bicep b/modules/event-hub/namespace/eventhubs/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/event-hub/namespaces/eventhubs/.bicep/nested_roleAssignments.bicep rename to modules/event-hub/namespace/eventhubs/.bicep/nested_roleAssignments.bicep diff --git a/modules/event-hub/namespaces/eventhubs/README.md b/modules/event-hub/namespace/eventhubs/README.md similarity index 100% rename from modules/event-hub/namespaces/eventhubs/README.md rename to modules/event-hub/namespace/eventhubs/README.md diff --git a/modules/event-hub/namespaces/eventhubs/authorization-rules/README.md b/modules/event-hub/namespace/eventhubs/authorization-rules/README.md similarity index 100% rename from modules/event-hub/namespaces/eventhubs/authorization-rules/README.md rename to modules/event-hub/namespace/eventhubs/authorization-rules/README.md diff --git a/modules/event-hub/namespaces/eventhubs/authorization-rules/main.bicep b/modules/event-hub/namespace/eventhubs/authorization-rules/main.bicep similarity index 100% rename from modules/event-hub/namespaces/eventhubs/authorization-rules/main.bicep rename to modules/event-hub/namespace/eventhubs/authorization-rules/main.bicep diff --git a/modules/event-hub/namespaces/eventhubs/authorization-rules/main.json b/modules/event-hub/namespace/eventhubs/authorization-rules/main.json similarity index 100% rename from modules/event-hub/namespaces/eventhubs/authorization-rules/main.json rename to modules/event-hub/namespace/eventhubs/authorization-rules/main.json diff --git a/modules/event-hub/namespaces/eventhubs/authorization-rules/version.json b/modules/event-hub/namespace/eventhubs/authorization-rules/version.json similarity index 100% rename from modules/event-hub/namespaces/eventhubs/authorization-rules/version.json rename to modules/event-hub/namespace/eventhubs/authorization-rules/version.json diff --git a/modules/event-hub/namespaces/eventhubs/consumergroups/README.md b/modules/event-hub/namespace/eventhubs/consumergroups/README.md similarity index 100% rename from modules/event-hub/namespaces/eventhubs/consumergroups/README.md rename to modules/event-hub/namespace/eventhubs/consumergroups/README.md diff --git a/modules/event-hub/namespaces/eventhubs/consumergroups/main.bicep b/modules/event-hub/namespace/eventhubs/consumergroups/main.bicep similarity index 100% rename from modules/event-hub/namespaces/eventhubs/consumergroups/main.bicep rename to modules/event-hub/namespace/eventhubs/consumergroups/main.bicep diff --git a/modules/event-hub/namespaces/eventhubs/consumergroups/main.json b/modules/event-hub/namespace/eventhubs/consumergroups/main.json similarity index 100% rename from modules/event-hub/namespaces/eventhubs/consumergroups/main.json rename to modules/event-hub/namespace/eventhubs/consumergroups/main.json diff --git a/modules/event-hub/namespaces/eventhubs/consumergroups/version.json b/modules/event-hub/namespace/eventhubs/consumergroups/version.json similarity index 100% rename from modules/event-hub/namespaces/eventhubs/consumergroups/version.json rename to modules/event-hub/namespace/eventhubs/consumergroups/version.json diff --git a/modules/event-hub/namespaces/eventhubs/main.bicep b/modules/event-hub/namespace/eventhubs/main.bicep similarity index 97% rename from modules/event-hub/namespaces/eventhubs/main.bicep rename to modules/event-hub/namespace/eventhubs/main.bicep index f11416339d..50ffeba337 100644 --- a/modules/event-hub/namespaces/eventhubs/main.bicep +++ b/modules/event-hub/namespace/eventhubs/main.bicep @@ -159,7 +159,7 @@ resource eventHub_lock 'Microsoft.Authorization/locks@2020-05-01' = if (!empty(l scope: eventHub } -module eventHub_consumergroups 'consumergroups/main.bicep' = [for (consumerGroup, index) in consumergroups: { +module eventHub_consumergroups 'consumergroup/main.bicep' = [for (consumerGroup, index) in consumergroups: { name: '${deployment().name}-ConsumerGroup-${index}' params: { namespaceName: namespaceName @@ -170,7 +170,7 @@ module eventHub_consumergroups 'consumergroups/main.bicep' = [for (consumerGroup } }] -module eventHub_authorizationRules 'authorization-rules/main.bicep' = [for (authorizationRule, index) in authorizationRules: { +module eventHub_authorizationRules 'authorization-rule/main.bicep' = [for (authorizationRule, index) in authorizationRules: { name: '${deployment().name}-AuthRule-${index}' params: { namespaceName: namespaceName diff --git a/modules/event-hub/namespaces/eventhubs/main.json b/modules/event-hub/namespace/eventhubs/main.json similarity index 100% rename from modules/event-hub/namespaces/eventhubs/main.json rename to modules/event-hub/namespace/eventhubs/main.json diff --git a/modules/event-hub/namespaces/eventhubs/version.json b/modules/event-hub/namespace/eventhubs/version.json similarity index 100% rename from modules/event-hub/namespaces/eventhubs/version.json rename to modules/event-hub/namespace/eventhubs/version.json diff --git a/modules/event-hub/namespaces/main.bicep b/modules/event-hub/namespace/main.bicep similarity index 97% rename from modules/event-hub/namespaces/main.bicep rename to modules/event-hub/namespace/main.bicep index 74ee6ca6e2..d87e07f38b 100644 --- a/modules/event-hub/namespaces/main.bicep +++ b/modules/event-hub/namespace/main.bicep @@ -261,7 +261,7 @@ resource eventHubNamespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = } } -module eventHubNamespace_authorizationRules 'authorization-rules/main.bicep' = [for (authorizationRule, index) in authorizationRules: { +module eventHubNamespace_authorizationRules 'authorization-rule/main.bicep' = [for (authorizationRule, index) in authorizationRules: { name: '${uniqueString(deployment().name, location)}-EvhbNamespace-AuthRule-${index}' params: { namespaceName: eventHubNamespace.name @@ -271,7 +271,7 @@ module eventHubNamespace_authorizationRules 'authorization-rules/main.bicep' = [ } }] -module eventHubNamespace_disasterRecoveryConfig 'disaster-recovery-configs/main.bicep' = if (!empty(disasterRecoveryConfig)) { +module eventHubNamespace_disasterRecoveryConfig 'disaster-recovery-config/main.bicep' = if (!empty(disasterRecoveryConfig)) { name: '${uniqueString(deployment().name, location)}-EvhbNamespace-DisRecConfig' params: { namespaceName: eventHubNamespace.name @@ -281,7 +281,7 @@ module eventHubNamespace_disasterRecoveryConfig 'disaster-recovery-configs/main. } } -module eventHubNamespace_eventhubs 'eventhubs/main.bicep' = [for (eventHub, index) in eventhubs: { +module eventHubNamespace_eventhubs 'eventhub/main.bicep' = [for (eventHub, index) in eventhubs: { name: '${uniqueString(deployment().name, location)}-EvhbNamespace-EventHub-${index}' params: { namespaceName: eventHubNamespace.name @@ -315,7 +315,7 @@ module eventHubNamespace_eventhubs 'eventhubs/main.bicep' = [for (eventHub, inde } }] -module eventHubNamespace_networkRuleSet 'network-rule-sets/main.bicep' = if (!empty(networkRuleSets) || !empty(privateEndpoints)) { +module eventHubNamespace_networkRuleSet 'network-rule-set/main.bicep' = if (!empty(networkRuleSets) || !empty(privateEndpoints)) { name: '${uniqueString(deployment().name, location)}-EvhbNamespace-NetworkRuleSet' params: { namespaceName: eventHubNamespace.name @@ -328,7 +328,7 @@ module eventHubNamespace_networkRuleSet 'network-rule-sets/main.bicep' = if (!em } } -module eventHubNamespace_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module eventHubNamespace_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-EvhbNamespace-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/event-hub/namespaces/main.json b/modules/event-hub/namespace/main.json similarity index 100% rename from modules/event-hub/namespaces/main.json rename to modules/event-hub/namespace/main.json diff --git a/modules/event-hub/namespaces/network-rule-sets/README.md b/modules/event-hub/namespace/network-rule-sets/README.md similarity index 100% rename from modules/event-hub/namespaces/network-rule-sets/README.md rename to modules/event-hub/namespace/network-rule-sets/README.md diff --git a/modules/event-hub/namespaces/network-rule-sets/main.bicep b/modules/event-hub/namespace/network-rule-sets/main.bicep similarity index 100% rename from modules/event-hub/namespaces/network-rule-sets/main.bicep rename to modules/event-hub/namespace/network-rule-sets/main.bicep diff --git a/modules/event-hub/namespaces/network-rule-sets/main.json b/modules/event-hub/namespace/network-rule-sets/main.json similarity index 100% rename from modules/event-hub/namespaces/network-rule-sets/main.json rename to modules/event-hub/namespace/network-rule-sets/main.json diff --git a/modules/event-hub/namespaces/network-rule-sets/version.json b/modules/event-hub/namespace/network-rule-sets/version.json similarity index 100% rename from modules/event-hub/namespaces/network-rule-sets/version.json rename to modules/event-hub/namespace/network-rule-sets/version.json diff --git a/modules/event-hub/namespaces/version.json b/modules/event-hub/namespace/version.json similarity index 100% rename from modules/event-hub/namespaces/version.json rename to modules/event-hub/namespace/version.json diff --git a/modules/health-bot/health-bots/.bicep/nested_roleAssignments.bicep b/modules/health-bot/health-bot/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/health-bot/health-bots/.bicep/nested_roleAssignments.bicep rename to modules/health-bot/health-bot/.bicep/nested_roleAssignments.bicep diff --git a/modules/health-bot/health-bots/.test/common/dependencies.bicep b/modules/health-bot/health-bot/.test/common/dependencies.bicep similarity index 100% rename from modules/health-bot/health-bots/.test/common/dependencies.bicep rename to modules/health-bot/health-bot/.test/common/dependencies.bicep diff --git a/modules/health-bot/health-bots/.test/common/main.test.bicep b/modules/health-bot/health-bot/.test/common/main.test.bicep similarity index 100% rename from modules/health-bot/health-bots/.test/common/main.test.bicep rename to modules/health-bot/health-bot/.test/common/main.test.bicep diff --git a/modules/health-bot/health-bots/.test/main.test.bicep b/modules/health-bot/health-bot/.test/main.test.bicep similarity index 100% rename from modules/health-bot/health-bots/.test/main.test.bicep rename to modules/health-bot/health-bot/.test/main.test.bicep diff --git a/modules/health-bot/health-bots/.test/min/main.test.bicep b/modules/health-bot/health-bot/.test/min/main.test.bicep similarity index 100% rename from modules/health-bot/health-bots/.test/min/main.test.bicep rename to modules/health-bot/health-bot/.test/min/main.test.bicep diff --git a/modules/health-bot/health-bots/README.md b/modules/health-bot/health-bot/README.md similarity index 98% rename from modules/health-bot/health-bots/README.md rename to modules/health-bot/health-bot/README.md index 575b6de5f0..34b48744a0 100644 --- a/modules/health-bot/health-bots/README.md +++ b/modules/health-bot/health-bot/README.md @@ -199,7 +199,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module healthBots './health-bot/health-bots/main.bicep' = { +module healthBots './health-bot/health-bot/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-hbhbcom' params: { // Required parameters @@ -290,7 +290,7 @@ module healthBots './health-bot/health-bots/main.bicep' = { via Bicep module ```bicep -module healthBots './health-bot/health-bots/main.bicep' = { +module healthBots './health-bot/health-bot/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-hbhbmin' params: { // Required parameters diff --git a/modules/health-bot/health-bots/main.bicep b/modules/health-bot/health-bot/main.bicep similarity index 100% rename from modules/health-bot/health-bots/main.bicep rename to modules/health-bot/health-bot/main.bicep diff --git a/modules/health-bot/health-bots/main.json b/modules/health-bot/health-bot/main.json similarity index 100% rename from modules/health-bot/health-bots/main.json rename to modules/health-bot/health-bot/main.json diff --git a/modules/health-bot/health-bots/version.json b/modules/health-bot/health-bot/version.json similarity index 100% rename from modules/health-bot/health-bots/version.json rename to modules/health-bot/health-bot/version.json diff --git a/modules/healthcare-apis/workspaces/.bicep/nested_roleAssignments.bicep b/modules/healthcare-apis/workspace/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/healthcare-apis/workspaces/.bicep/nested_roleAssignments.bicep rename to modules/healthcare-apis/workspace/.bicep/nested_roleAssignments.bicep diff --git a/modules/healthcare-apis/workspaces/.test/common/dependencies.bicep b/modules/healthcare-apis/workspace/.test/common/dependencies.bicep similarity index 100% rename from modules/healthcare-apis/workspaces/.test/common/dependencies.bicep rename to modules/healthcare-apis/workspace/.test/common/dependencies.bicep diff --git a/modules/healthcare-apis/workspaces/.test/common/main.test.bicep b/modules/healthcare-apis/workspace/.test/common/main.test.bicep similarity index 100% rename from modules/healthcare-apis/workspaces/.test/common/main.test.bicep rename to modules/healthcare-apis/workspace/.test/common/main.test.bicep diff --git a/modules/healthcare-apis/workspaces/.test/main.test.bicep b/modules/healthcare-apis/workspace/.test/main.test.bicep similarity index 100% rename from modules/healthcare-apis/workspaces/.test/main.test.bicep rename to modules/healthcare-apis/workspace/.test/main.test.bicep diff --git a/modules/healthcare-apis/workspaces/.test/min/main.test.bicep b/modules/healthcare-apis/workspace/.test/min/main.test.bicep similarity index 100% rename from modules/healthcare-apis/workspaces/.test/min/main.test.bicep rename to modules/healthcare-apis/workspace/.test/min/main.test.bicep diff --git a/modules/healthcare-apis/workspaces/README.md b/modules/healthcare-apis/workspace/README.md similarity index 99% rename from modules/healthcare-apis/workspaces/README.md rename to modules/healthcare-apis/workspace/README.md index 308c1e0fb9..552e571465 100644 --- a/modules/healthcare-apis/workspaces/README.md +++ b/modules/healthcare-apis/workspace/README.md @@ -426,7 +426,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module workspaces './healthcare-apis/workspaces/main.bicep' = { +module workspaces './healthcare-apis/workspace/main.bicep' = { name: '${uniqueString(deployment().name)}-test-hawcom' params: { // Required parameters @@ -641,7 +641,7 @@ module workspaces './healthcare-apis/workspaces/main.bicep' = { via Bicep module ```bicep -module workspaces './healthcare-apis/workspaces/main.bicep' = { +module workspaces './healthcare-apis/workspace/main.bicep' = { name: '${uniqueString(deployment().name)}-test-hawmin' params: { // Required parameters diff --git a/modules/healthcare-apis/workspaces/dicomservices/README.md b/modules/healthcare-apis/workspace/dicomservices/README.md similarity index 100% rename from modules/healthcare-apis/workspaces/dicomservices/README.md rename to modules/healthcare-apis/workspace/dicomservices/README.md diff --git a/modules/healthcare-apis/workspaces/dicomservices/main.bicep b/modules/healthcare-apis/workspace/dicomservices/main.bicep similarity index 100% rename from modules/healthcare-apis/workspaces/dicomservices/main.bicep rename to modules/healthcare-apis/workspace/dicomservices/main.bicep diff --git a/modules/healthcare-apis/workspaces/dicomservices/main.json b/modules/healthcare-apis/workspace/dicomservices/main.json similarity index 100% rename from modules/healthcare-apis/workspaces/dicomservices/main.json rename to modules/healthcare-apis/workspace/dicomservices/main.json diff --git a/modules/healthcare-apis/workspaces/dicomservices/version.json b/modules/healthcare-apis/workspace/dicomservices/version.json similarity index 100% rename from modules/healthcare-apis/workspaces/dicomservices/version.json rename to modules/healthcare-apis/workspace/dicomservices/version.json diff --git a/modules/healthcare-apis/workspaces/fhirservices/.bicep/nested_roleAssignments.bicep b/modules/healthcare-apis/workspace/fhirservices/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/healthcare-apis/workspaces/fhirservices/.bicep/nested_roleAssignments.bicep rename to modules/healthcare-apis/workspace/fhirservices/.bicep/nested_roleAssignments.bicep diff --git a/modules/healthcare-apis/workspaces/fhirservices/README.md b/modules/healthcare-apis/workspace/fhirservices/README.md similarity index 100% rename from modules/healthcare-apis/workspaces/fhirservices/README.md rename to modules/healthcare-apis/workspace/fhirservices/README.md diff --git a/modules/healthcare-apis/workspaces/fhirservices/main.bicep b/modules/healthcare-apis/workspace/fhirservices/main.bicep similarity index 100% rename from modules/healthcare-apis/workspaces/fhirservices/main.bicep rename to modules/healthcare-apis/workspace/fhirservices/main.bicep diff --git a/modules/healthcare-apis/workspaces/fhirservices/main.json b/modules/healthcare-apis/workspace/fhirservices/main.json similarity index 100% rename from modules/healthcare-apis/workspaces/fhirservices/main.json rename to modules/healthcare-apis/workspace/fhirservices/main.json diff --git a/modules/healthcare-apis/workspaces/fhirservices/version.json b/modules/healthcare-apis/workspace/fhirservices/version.json similarity index 100% rename from modules/healthcare-apis/workspaces/fhirservices/version.json rename to modules/healthcare-apis/workspace/fhirservices/version.json diff --git a/modules/healthcare-apis/workspaces/iotconnectors/README.md b/modules/healthcare-apis/workspace/iotconnectors/README.md similarity index 100% rename from modules/healthcare-apis/workspaces/iotconnectors/README.md rename to modules/healthcare-apis/workspace/iotconnectors/README.md diff --git a/modules/healthcare-apis/workspaces/iotconnectors/fhirdestinations/README.md b/modules/healthcare-apis/workspace/iotconnectors/fhirdestinations/README.md similarity index 100% rename from modules/healthcare-apis/workspaces/iotconnectors/fhirdestinations/README.md rename to modules/healthcare-apis/workspace/iotconnectors/fhirdestinations/README.md diff --git a/modules/healthcare-apis/workspaces/iotconnectors/fhirdestinations/main.bicep b/modules/healthcare-apis/workspace/iotconnectors/fhirdestinations/main.bicep similarity index 100% rename from modules/healthcare-apis/workspaces/iotconnectors/fhirdestinations/main.bicep rename to modules/healthcare-apis/workspace/iotconnectors/fhirdestinations/main.bicep diff --git a/modules/healthcare-apis/workspaces/iotconnectors/fhirdestinations/main.json b/modules/healthcare-apis/workspace/iotconnectors/fhirdestinations/main.json similarity index 100% rename from modules/healthcare-apis/workspaces/iotconnectors/fhirdestinations/main.json rename to modules/healthcare-apis/workspace/iotconnectors/fhirdestinations/main.json diff --git a/modules/healthcare-apis/workspaces/iotconnectors/fhirdestinations/version.json b/modules/healthcare-apis/workspace/iotconnectors/fhirdestinations/version.json similarity index 100% rename from modules/healthcare-apis/workspaces/iotconnectors/fhirdestinations/version.json rename to modules/healthcare-apis/workspace/iotconnectors/fhirdestinations/version.json diff --git a/modules/healthcare-apis/workspaces/iotconnectors/main.bicep b/modules/healthcare-apis/workspace/iotconnectors/main.bicep similarity index 98% rename from modules/healthcare-apis/workspaces/iotconnectors/main.bicep rename to modules/healthcare-apis/workspace/iotconnectors/main.bicep index 74f7c3b9e6..0f18338e21 100644 --- a/modules/healthcare-apis/workspaces/iotconnectors/main.bicep +++ b/modules/healthcare-apis/workspace/iotconnectors/main.bicep @@ -173,7 +173,7 @@ resource iotConnector_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@ scope: iotConnector } -module fhir_destination 'fhirdestinations/main.bicep' = if (!empty(fhirdestination)) { +module fhir_destination 'fhirdestination/main.bicep' = if (!empty(fhirdestination)) { name: '${deployment().name}-FhirDestination' params: { name: '${uniqueString(workspaceName, iotConnector.name)}-map' diff --git a/modules/healthcare-apis/workspaces/iotconnectors/main.json b/modules/healthcare-apis/workspace/iotconnectors/main.json similarity index 100% rename from modules/healthcare-apis/workspaces/iotconnectors/main.json rename to modules/healthcare-apis/workspace/iotconnectors/main.json diff --git a/modules/healthcare-apis/workspaces/iotconnectors/version.json b/modules/healthcare-apis/workspace/iotconnectors/version.json similarity index 100% rename from modules/healthcare-apis/workspaces/iotconnectors/version.json rename to modules/healthcare-apis/workspace/iotconnectors/version.json diff --git a/modules/healthcare-apis/workspaces/main.bicep b/modules/healthcare-apis/workspace/main.bicep similarity index 97% rename from modules/healthcare-apis/workspaces/main.bicep rename to modules/healthcare-apis/workspace/main.bicep index 83104af50b..2157ab87e5 100644 --- a/modules/healthcare-apis/workspaces/main.bicep +++ b/modules/healthcare-apis/workspace/main.bicep @@ -90,7 +90,7 @@ module workspace_roleAssignments '.bicep/nested_roleAssignments.bicep' = [for (r } }] -module workspace_fhirservices 'fhirservices/main.bicep' = [for (fhir, index) in fhirservices: { +module workspace_fhirservices 'fhirservice/main.bicep' = [for (fhir, index) in fhirservices: { name: '${uniqueString(deployment().name, location)}-Health-FHIR-${index}' params: { name: fhir.name @@ -131,7 +131,7 @@ module workspace_fhirservices 'fhirservices/main.bicep' = [for (fhir, index) in } }] -module workspace_dicomservices 'dicomservices/main.bicep' = [for (dicom, index) in dicomservices: { +module workspace_dicomservices 'dicomservice/main.bicep' = [for (dicom, index) in dicomservices: { name: '${uniqueString(deployment().name, location)}-Health-DICOM-${index}' params: { name: dicom.name @@ -157,7 +157,7 @@ module workspace_dicomservices 'dicomservices/main.bicep' = [for (dicom, index) } }] -module workspace_iotconnector 'iotconnectors/main.bicep' = [for (iotConnector, index) in iotconnectors: { +module workspace_iotconnector 'iotconnector/main.bicep' = [for (iotConnector, index) in iotconnectors: { name: '${uniqueString(deployment().name, location)}-Health-IOMT-${index}' params: { name: iotConnector.name diff --git a/modules/healthcare-apis/workspaces/main.json b/modules/healthcare-apis/workspace/main.json similarity index 100% rename from modules/healthcare-apis/workspaces/main.json rename to modules/healthcare-apis/workspace/main.json diff --git a/modules/healthcare-apis/workspaces/version.json b/modules/healthcare-apis/workspace/version.json similarity index 100% rename from modules/healthcare-apis/workspaces/version.json rename to modules/healthcare-apis/workspace/version.json diff --git a/modules/insights/action-groups/.bicep/nested_roleAssignments.bicep b/modules/insights/action-group/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/insights/action-groups/.bicep/nested_roleAssignments.bicep rename to modules/insights/action-group/.bicep/nested_roleAssignments.bicep diff --git a/modules/insights/action-groups/.test/common/dependencies.bicep b/modules/insights/action-group/.test/common/dependencies.bicep similarity index 100% rename from modules/insights/action-groups/.test/common/dependencies.bicep rename to modules/insights/action-group/.test/common/dependencies.bicep diff --git a/modules/insights/action-groups/.test/common/main.test.bicep b/modules/insights/action-group/.test/common/main.test.bicep similarity index 100% rename from modules/insights/action-groups/.test/common/main.test.bicep rename to modules/insights/action-group/.test/common/main.test.bicep diff --git a/modules/insights/action-groups/.test/main.test.bicep b/modules/insights/action-group/.test/main.test.bicep similarity index 100% rename from modules/insights/action-groups/.test/main.test.bicep rename to modules/insights/action-group/.test/main.test.bicep diff --git a/modules/insights/action-groups/.test/min/main.test.bicep b/modules/insights/action-group/.test/min/main.test.bicep similarity index 100% rename from modules/insights/action-groups/.test/min/main.test.bicep rename to modules/insights/action-group/.test/min/main.test.bicep diff --git a/modules/insights/action-groups/README.md b/modules/insights/action-group/README.md similarity index 98% rename from modules/insights/action-groups/README.md rename to modules/insights/action-group/README.md index d33d5f091d..21111edfe8 100644 --- a/modules/insights/action-groups/README.md +++ b/modules/insights/action-group/README.md @@ -251,7 +251,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module actionGroups './insights/action-groups/main.bicep' = { +module actionGroups './insights/action-group/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-iagcom' params: { // Required parameters @@ -370,7 +370,7 @@ module actionGroups './insights/action-groups/main.bicep' = { via Bicep module ```bicep -module actionGroups './insights/action-groups/main.bicep' = { +module actionGroups './insights/action-group/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-iagmin' params: { // Required parameters diff --git a/modules/insights/action-groups/main.bicep b/modules/insights/action-group/main.bicep similarity index 100% rename from modules/insights/action-groups/main.bicep rename to modules/insights/action-group/main.bicep diff --git a/modules/insights/action-groups/main.json b/modules/insights/action-group/main.json similarity index 100% rename from modules/insights/action-groups/main.json rename to modules/insights/action-group/main.json diff --git a/modules/insights/action-groups/version.json b/modules/insights/action-group/version.json similarity index 100% rename from modules/insights/action-groups/version.json rename to modules/insights/action-group/version.json diff --git a/modules/insights/activity-log-alerts/.bicep/nested_roleAssignments.bicep b/modules/insights/activity-log-alert/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/insights/activity-log-alerts/.bicep/nested_roleAssignments.bicep rename to modules/insights/activity-log-alert/.bicep/nested_roleAssignments.bicep diff --git a/modules/insights/activity-log-alerts/.test/common/dependencies.bicep b/modules/insights/activity-log-alert/.test/common/dependencies.bicep similarity index 100% rename from modules/insights/activity-log-alerts/.test/common/dependencies.bicep rename to modules/insights/activity-log-alert/.test/common/dependencies.bicep diff --git a/modules/insights/activity-log-alerts/.test/common/main.test.bicep b/modules/insights/activity-log-alert/.test/common/main.test.bicep similarity index 100% rename from modules/insights/activity-log-alerts/.test/common/main.test.bicep rename to modules/insights/activity-log-alert/.test/common/main.test.bicep diff --git a/modules/insights/activity-log-alerts/.test/main.test.bicep b/modules/insights/activity-log-alert/.test/main.test.bicep similarity index 100% rename from modules/insights/activity-log-alerts/.test/main.test.bicep rename to modules/insights/activity-log-alert/.test/main.test.bicep diff --git a/modules/insights/activity-log-alerts/README.md b/modules/insights/activity-log-alert/README.md similarity index 99% rename from modules/insights/activity-log-alerts/README.md rename to modules/insights/activity-log-alert/README.md index cae90cc6bd..b93ba3ceba 100644 --- a/modules/insights/activity-log-alerts/README.md +++ b/modules/insights/activity-log-alert/README.md @@ -413,7 +413,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module activityLogAlerts './insights/activity-log-alerts/main.bicep' = { +module activityLogAlerts './insights/activity-log-alert/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ialacom' params: { // Required parameters diff --git a/modules/insights/activity-log-alerts/main.bicep b/modules/insights/activity-log-alert/main.bicep similarity index 100% rename from modules/insights/activity-log-alerts/main.bicep rename to modules/insights/activity-log-alert/main.bicep diff --git a/modules/insights/activity-log-alerts/main.json b/modules/insights/activity-log-alert/main.json similarity index 100% rename from modules/insights/activity-log-alerts/main.json rename to modules/insights/activity-log-alert/main.json diff --git a/modules/insights/activity-log-alerts/version.json b/modules/insights/activity-log-alert/version.json similarity index 100% rename from modules/insights/activity-log-alerts/version.json rename to modules/insights/activity-log-alert/version.json diff --git a/modules/insights/components/.bicep/nested_roleAssignments.bicep b/modules/insights/component/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/insights/components/.bicep/nested_roleAssignments.bicep rename to modules/insights/component/.bicep/nested_roleAssignments.bicep diff --git a/modules/insights/components/.test/common/dependencies.bicep b/modules/insights/component/.test/common/dependencies.bicep similarity index 100% rename from modules/insights/components/.test/common/dependencies.bicep rename to modules/insights/component/.test/common/dependencies.bicep diff --git a/modules/insights/components/.test/common/main.test.bicep b/modules/insights/component/.test/common/main.test.bicep similarity index 100% rename from modules/insights/components/.test/common/main.test.bicep rename to modules/insights/component/.test/common/main.test.bicep diff --git a/modules/insights/components/.test/main.test.bicep b/modules/insights/component/.test/main.test.bicep similarity index 100% rename from modules/insights/components/.test/main.test.bicep rename to modules/insights/component/.test/main.test.bicep diff --git a/modules/insights/components/.test/min/dependencies.bicep b/modules/insights/component/.test/min/dependencies.bicep similarity index 100% rename from modules/insights/components/.test/min/dependencies.bicep rename to modules/insights/component/.test/min/dependencies.bicep diff --git a/modules/insights/components/.test/min/main.test.bicep b/modules/insights/component/.test/min/main.test.bicep similarity index 100% rename from modules/insights/components/.test/min/main.test.bicep rename to modules/insights/component/.test/min/main.test.bicep diff --git a/modules/insights/components/README.md b/modules/insights/component/README.md similarity index 98% rename from modules/insights/components/README.md rename to modules/insights/component/README.md index e22d71c490..dcc0967911 100644 --- a/modules/insights/components/README.md +++ b/modules/insights/component/README.md @@ -180,7 +180,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module components './insights/components/main.bicep' = { +module components './insights/component/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-iccom' params: { // Required parameters @@ -279,7 +279,7 @@ module components './insights/components/main.bicep' = { via Bicep module ```bicep -module components './insights/components/main.bicep' = { +module components './insights/component/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-icmin' params: { // Required parameters diff --git a/modules/insights/components/main.bicep b/modules/insights/component/main.bicep similarity index 100% rename from modules/insights/components/main.bicep rename to modules/insights/component/main.bicep diff --git a/modules/insights/components/main.json b/modules/insights/component/main.json similarity index 100% rename from modules/insights/components/main.json rename to modules/insights/component/main.json diff --git a/modules/insights/components/version.json b/modules/insights/component/version.json similarity index 100% rename from modules/insights/components/version.json rename to modules/insights/component/version.json diff --git a/modules/insights/data-collection-endpoints/.bicep/nested_roleAssignments.bicep b/modules/insights/data-collection-endpoint/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/insights/data-collection-endpoints/.bicep/nested_roleAssignments.bicep rename to modules/insights/data-collection-endpoint/.bicep/nested_roleAssignments.bicep diff --git a/modules/insights/data-collection-endpoints/.test/common/dependencies.bicep b/modules/insights/data-collection-endpoint/.test/common/dependencies.bicep similarity index 100% rename from modules/insights/data-collection-endpoints/.test/common/dependencies.bicep rename to modules/insights/data-collection-endpoint/.test/common/dependencies.bicep diff --git a/modules/insights/data-collection-endpoints/.test/common/main.test.bicep b/modules/insights/data-collection-endpoint/.test/common/main.test.bicep similarity index 100% rename from modules/insights/data-collection-endpoints/.test/common/main.test.bicep rename to modules/insights/data-collection-endpoint/.test/common/main.test.bicep diff --git a/modules/insights/data-collection-endpoints/.test/main.test.bicep b/modules/insights/data-collection-endpoint/.test/main.test.bicep similarity index 100% rename from modules/insights/data-collection-endpoints/.test/main.test.bicep rename to modules/insights/data-collection-endpoint/.test/main.test.bicep diff --git a/modules/insights/data-collection-endpoints/.test/min/main.test.bicep b/modules/insights/data-collection-endpoint/.test/min/main.test.bicep similarity index 100% rename from modules/insights/data-collection-endpoints/.test/min/main.test.bicep rename to modules/insights/data-collection-endpoint/.test/min/main.test.bicep diff --git a/modules/insights/data-collection-endpoints/README.md b/modules/insights/data-collection-endpoint/README.md similarity index 99% rename from modules/insights/data-collection-endpoints/README.md rename to modules/insights/data-collection-endpoint/README.md index f72ff2b45a..80532cd55d 100644 --- a/modules/insights/data-collection-endpoints/README.md +++ b/modules/insights/data-collection-endpoint/README.md @@ -166,7 +166,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module dataCollectionEndpoints './insights/data-collection-endpoints/main.bicep' = { +module dataCollectionEndpoints './insights/data-collection-endpoint/main.bicep' = { name: '${uniqueString(deployment().name)}-test-idcecom' params: { // Required parameters @@ -253,7 +253,7 @@ module dataCollectionEndpoints './insights/data-collection-endpoints/main.bicep' via Bicep module ```bicep -module dataCollectionEndpoints './insights/data-collection-endpoints/main.bicep' = { +module dataCollectionEndpoints './insights/data-collection-endpoint/main.bicep' = { name: '${uniqueString(deployment().name)}-test-idcemin' params: { // Required parameters diff --git a/modules/insights/data-collection-endpoints/main.bicep b/modules/insights/data-collection-endpoint/main.bicep similarity index 100% rename from modules/insights/data-collection-endpoints/main.bicep rename to modules/insights/data-collection-endpoint/main.bicep diff --git a/modules/insights/data-collection-endpoints/main.json b/modules/insights/data-collection-endpoint/main.json similarity index 100% rename from modules/insights/data-collection-endpoints/main.json rename to modules/insights/data-collection-endpoint/main.json diff --git a/modules/insights/data-collection-endpoints/version.json b/modules/insights/data-collection-endpoint/version.json similarity index 100% rename from modules/insights/data-collection-endpoints/version.json rename to modules/insights/data-collection-endpoint/version.json diff --git a/modules/insights/data-collection-rules/.bicep/nested_roleAssignments.bicep b/modules/insights/data-collection-rule/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/insights/data-collection-rules/.bicep/nested_roleAssignments.bicep rename to modules/insights/data-collection-rule/.bicep/nested_roleAssignments.bicep diff --git a/modules/insights/data-collection-rules/.test/customadv/dependencies.bicep b/modules/insights/data-collection-rule/.test/customadv/dependencies.bicep similarity index 100% rename from modules/insights/data-collection-rules/.test/customadv/dependencies.bicep rename to modules/insights/data-collection-rule/.test/customadv/dependencies.bicep diff --git a/modules/insights/data-collection-rules/.test/customadv/main.test.bicep b/modules/insights/data-collection-rule/.test/customadv/main.test.bicep similarity index 100% rename from modules/insights/data-collection-rules/.test/customadv/main.test.bicep rename to modules/insights/data-collection-rule/.test/customadv/main.test.bicep diff --git a/modules/insights/data-collection-rules/.test/custombasic/dependencies.bicep b/modules/insights/data-collection-rule/.test/custombasic/dependencies.bicep similarity index 100% rename from modules/insights/data-collection-rules/.test/custombasic/dependencies.bicep rename to modules/insights/data-collection-rule/.test/custombasic/dependencies.bicep diff --git a/modules/insights/data-collection-rules/.test/custombasic/main.test.bicep b/modules/insights/data-collection-rule/.test/custombasic/main.test.bicep similarity index 100% rename from modules/insights/data-collection-rules/.test/custombasic/main.test.bicep rename to modules/insights/data-collection-rule/.test/custombasic/main.test.bicep diff --git a/modules/insights/data-collection-rules/.test/customiis/dependencies.bicep b/modules/insights/data-collection-rule/.test/customiis/dependencies.bicep similarity index 100% rename from modules/insights/data-collection-rules/.test/customiis/dependencies.bicep rename to modules/insights/data-collection-rule/.test/customiis/dependencies.bicep diff --git a/modules/insights/data-collection-rules/.test/customiis/main.test.bicep b/modules/insights/data-collection-rule/.test/customiis/main.test.bicep similarity index 100% rename from modules/insights/data-collection-rules/.test/customiis/main.test.bicep rename to modules/insights/data-collection-rule/.test/customiis/main.test.bicep diff --git a/modules/insights/data-collection-rules/.test/linux/dependencies.bicep b/modules/insights/data-collection-rule/.test/linux/dependencies.bicep similarity index 100% rename from modules/insights/data-collection-rules/.test/linux/dependencies.bicep rename to modules/insights/data-collection-rule/.test/linux/dependencies.bicep diff --git a/modules/insights/data-collection-rules/.test/linux/main.test.bicep b/modules/insights/data-collection-rule/.test/linux/main.test.bicep similarity index 100% rename from modules/insights/data-collection-rules/.test/linux/main.test.bicep rename to modules/insights/data-collection-rule/.test/linux/main.test.bicep diff --git a/modules/insights/data-collection-rules/.test/main.test.bicep b/modules/insights/data-collection-rule/.test/main.test.bicep similarity index 100% rename from modules/insights/data-collection-rules/.test/main.test.bicep rename to modules/insights/data-collection-rule/.test/main.test.bicep diff --git a/modules/insights/data-collection-rules/.test/min/main.test.bicep b/modules/insights/data-collection-rule/.test/min/main.test.bicep similarity index 100% rename from modules/insights/data-collection-rules/.test/min/main.test.bicep rename to modules/insights/data-collection-rule/.test/min/main.test.bicep diff --git a/modules/insights/data-collection-rules/.test/windows/dependencies.bicep b/modules/insights/data-collection-rule/.test/windows/dependencies.bicep similarity index 100% rename from modules/insights/data-collection-rules/.test/windows/dependencies.bicep rename to modules/insights/data-collection-rule/.test/windows/dependencies.bicep diff --git a/modules/insights/data-collection-rules/.test/windows/main.test.bicep b/modules/insights/data-collection-rule/.test/windows/main.test.bicep similarity index 100% rename from modules/insights/data-collection-rules/.test/windows/main.test.bicep rename to modules/insights/data-collection-rule/.test/windows/main.test.bicep diff --git a/modules/insights/data-collection-rules/README.md b/modules/insights/data-collection-rule/README.md similarity index 98% rename from modules/insights/data-collection-rules/README.md rename to modules/insights/data-collection-rule/README.md index 63daa73ef0..a38f1b87e9 100644 --- a/modules/insights/data-collection-rules/README.md +++ b/modules/insights/data-collection-rule/README.md @@ -171,7 +171,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module dataCollectionRules './insights/data-collection-rules/main.bicep' = { +module dataCollectionRules './insights/data-collection-rule/main.bicep' = { name: '${uniqueString(deployment().name)}-test-idcrcusadv' params: { // Required parameters @@ -410,7 +410,7 @@ module dataCollectionRules './insights/data-collection-rules/main.bicep' = { via Bicep module ```bicep -module dataCollectionRules './insights/data-collection-rules/main.bicep' = { +module dataCollectionRules './insights/data-collection-rule/main.bicep' = { name: '${uniqueString(deployment().name)}-test-idcrcusbas' params: { // Required parameters @@ -617,7 +617,7 @@ module dataCollectionRules './insights/data-collection-rules/main.bicep' = { via Bicep module ```bicep -module dataCollectionRules './insights/data-collection-rules/main.bicep' = { +module dataCollectionRules './insights/data-collection-rule/main.bicep' = { name: '${uniqueString(deployment().name)}-test-idcrcusiis' params: { // Required parameters @@ -780,7 +780,7 @@ module dataCollectionRules './insights/data-collection-rules/main.bicep' = { via Bicep module ```bicep -module dataCollectionRules './insights/data-collection-rules/main.bicep' = { +module dataCollectionRules './insights/data-collection-rule/main.bicep' = { name: '${uniqueString(deployment().name)}-test-idcrlin' params: { // Required parameters @@ -1167,7 +1167,7 @@ module dataCollectionRules './insights/data-collection-rules/main.bicep' = { via Bicep module ```bicep -module dataCollectionRules './insights/data-collection-rules/main.bicep' = { +module dataCollectionRules './insights/data-collection-rule/main.bicep' = { name: '${uniqueString(deployment().name)}-test-idcrmin' params: { // Required parameters @@ -1298,7 +1298,7 @@ module dataCollectionRules './insights/data-collection-rules/main.bicep' = { via Bicep module ```bicep -module dataCollectionRules './insights/data-collection-rules/main.bicep' = { +module dataCollectionRules './insights/data-collection-rule/main.bicep' = { name: '${uniqueString(deployment().name)}-test-idcrwin' params: { // Required parameters diff --git a/modules/insights/data-collection-rules/main.bicep b/modules/insights/data-collection-rule/main.bicep similarity index 100% rename from modules/insights/data-collection-rules/main.bicep rename to modules/insights/data-collection-rule/main.bicep diff --git a/modules/insights/data-collection-rules/main.json b/modules/insights/data-collection-rule/main.json similarity index 100% rename from modules/insights/data-collection-rules/main.json rename to modules/insights/data-collection-rule/main.json diff --git a/modules/insights/data-collection-rules/version.json b/modules/insights/data-collection-rule/version.json similarity index 100% rename from modules/insights/data-collection-rules/version.json rename to modules/insights/data-collection-rule/version.json diff --git a/modules/insights/diagnostic-settings/.test/common/main.test.bicep b/modules/insights/diagnostic-setting/.test/common/main.test.bicep similarity index 100% rename from modules/insights/diagnostic-settings/.test/common/main.test.bicep rename to modules/insights/diagnostic-setting/.test/common/main.test.bicep diff --git a/modules/insights/diagnostic-settings/.test/main.test.bicep b/modules/insights/diagnostic-setting/.test/main.test.bicep similarity index 100% rename from modules/insights/diagnostic-settings/.test/main.test.bicep rename to modules/insights/diagnostic-setting/.test/main.test.bicep diff --git a/modules/insights/diagnostic-settings/README.md b/modules/insights/diagnostic-setting/README.md similarity index 98% rename from modules/insights/diagnostic-settings/README.md rename to modules/insights/diagnostic-setting/README.md index 006ffca9dd..3d11e77c11 100644 --- a/modules/insights/diagnostic-settings/README.md +++ b/modules/insights/diagnostic-setting/README.md @@ -59,7 +59,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module diagnosticSettings './insights/diagnostic-settings/main.bicep' = { +module diagnosticSettings './insights/diagnostic-setting/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-idscom' params: { diagnosticEventHubAuthorizationRuleId: '' diff --git a/modules/insights/diagnostic-settings/main.bicep b/modules/insights/diagnostic-setting/main.bicep similarity index 100% rename from modules/insights/diagnostic-settings/main.bicep rename to modules/insights/diagnostic-setting/main.bicep diff --git a/modules/insights/diagnostic-settings/main.json b/modules/insights/diagnostic-setting/main.json similarity index 100% rename from modules/insights/diagnostic-settings/main.json rename to modules/insights/diagnostic-setting/main.json diff --git a/modules/insights/diagnostic-settings/version.json b/modules/insights/diagnostic-setting/version.json similarity index 100% rename from modules/insights/diagnostic-settings/version.json rename to modules/insights/diagnostic-setting/version.json diff --git a/modules/insights/metric-alerts/.bicep/nested_roleAssignments.bicep b/modules/insights/metric-alert/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/insights/metric-alerts/.bicep/nested_roleAssignments.bicep rename to modules/insights/metric-alert/.bicep/nested_roleAssignments.bicep diff --git a/modules/insights/metric-alerts/.test/common/dependencies.bicep b/modules/insights/metric-alert/.test/common/dependencies.bicep similarity index 100% rename from modules/insights/metric-alerts/.test/common/dependencies.bicep rename to modules/insights/metric-alert/.test/common/dependencies.bicep diff --git a/modules/insights/metric-alerts/.test/common/main.test.bicep b/modules/insights/metric-alert/.test/common/main.test.bicep similarity index 100% rename from modules/insights/metric-alerts/.test/common/main.test.bicep rename to modules/insights/metric-alert/.test/common/main.test.bicep diff --git a/modules/insights/metric-alerts/.test/main.test.bicep b/modules/insights/metric-alert/.test/main.test.bicep similarity index 100% rename from modules/insights/metric-alerts/.test/main.test.bicep rename to modules/insights/metric-alert/.test/main.test.bicep diff --git a/modules/insights/metric-alerts/README.md b/modules/insights/metric-alert/README.md similarity index 99% rename from modules/insights/metric-alerts/README.md rename to modules/insights/metric-alert/README.md index 7d5a4c759d..e2d9d241b9 100644 --- a/modules/insights/metric-alerts/README.md +++ b/modules/insights/metric-alert/README.md @@ -395,7 +395,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module metricAlerts './insights/metric-alerts/main.bicep' = { +module metricAlerts './insights/metric-alert/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-imacom' params: { // Required parameters diff --git a/modules/insights/metric-alerts/main.bicep b/modules/insights/metric-alert/main.bicep similarity index 100% rename from modules/insights/metric-alerts/main.bicep rename to modules/insights/metric-alert/main.bicep diff --git a/modules/insights/metric-alerts/main.json b/modules/insights/metric-alert/main.json similarity index 100% rename from modules/insights/metric-alerts/main.json rename to modules/insights/metric-alert/main.json diff --git a/modules/insights/metric-alerts/version.json b/modules/insights/metric-alert/version.json similarity index 100% rename from modules/insights/metric-alerts/version.json rename to modules/insights/metric-alert/version.json diff --git a/modules/insights/private-link-scopes/.bicep/nested_roleAssignments.bicep b/modules/insights/private-link-scope/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/insights/private-link-scopes/.bicep/nested_roleAssignments.bicep rename to modules/insights/private-link-scope/.bicep/nested_roleAssignments.bicep diff --git a/modules/insights/private-link-scopes/.test/common/dependencies.bicep b/modules/insights/private-link-scope/.test/common/dependencies.bicep similarity index 100% rename from modules/insights/private-link-scopes/.test/common/dependencies.bicep rename to modules/insights/private-link-scope/.test/common/dependencies.bicep diff --git a/modules/insights/private-link-scopes/.test/common/main.test.bicep b/modules/insights/private-link-scope/.test/common/main.test.bicep similarity index 100% rename from modules/insights/private-link-scopes/.test/common/main.test.bicep rename to modules/insights/private-link-scope/.test/common/main.test.bicep diff --git a/modules/insights/private-link-scopes/.test/main.test.bicep b/modules/insights/private-link-scope/.test/main.test.bicep similarity index 100% rename from modules/insights/private-link-scopes/.test/main.test.bicep rename to modules/insights/private-link-scope/.test/main.test.bicep diff --git a/modules/insights/private-link-scopes/.test/min/main.test.bicep b/modules/insights/private-link-scope/.test/min/main.test.bicep similarity index 100% rename from modules/insights/private-link-scopes/.test/min/main.test.bicep rename to modules/insights/private-link-scope/.test/min/main.test.bicep diff --git a/modules/insights/private-link-scopes/README.md b/modules/insights/private-link-scope/README.md similarity index 98% rename from modules/insights/private-link-scopes/README.md rename to modules/insights/private-link-scope/README.md index 118453a44e..985ff26dd7 100644 --- a/modules/insights/private-link-scopes/README.md +++ b/modules/insights/private-link-scope/README.md @@ -273,7 +273,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module privateLinkScopes './insights/private-link-scopes/main.bicep' = { +module privateLinkScopes './insights/private-link-scope/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-iplscom' params: { // Required parameters @@ -394,7 +394,7 @@ module privateLinkScopes './insights/private-link-scopes/main.bicep' = { via Bicep module ```bicep -module privateLinkScopes './insights/private-link-scopes/main.bicep' = { +module privateLinkScopes './insights/private-link-scope/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-iplsmin' params: { // Required parameters diff --git a/modules/insights/private-link-scopes/main.bicep b/modules/insights/private-link-scope/main.bicep similarity index 96% rename from modules/insights/private-link-scopes/main.bicep rename to modules/insights/private-link-scope/main.bicep index 29196b4af9..20f8907cae 100644 --- a/modules/insights/private-link-scopes/main.bicep +++ b/modules/insights/private-link-scope/main.bicep @@ -53,7 +53,7 @@ resource privateLinkScope 'Microsoft.Insights/privateLinkScopes@2019-10-17-previ properties: {} } -module privateLinkScope_scopedResource 'scoped-resources/main.bicep' = [for (scopedResource, index) in scopedResources: { +module privateLinkScope_scopedResource 'scoped-resource/main.bicep' = [for (scopedResource, index) in scopedResources: { name: '${uniqueString(deployment().name, location)}-PvtLinkScope-ScopedRes-${index}' params: { name: scopedResource.name @@ -72,7 +72,7 @@ resource privateLinkScope_lock 'Microsoft.Authorization/locks@2020-05-01' = if ( scope: privateLinkScope } -module privateLinkScope_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module privateLinkScope_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-PvtLinkScope-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/insights/private-link-scopes/main.json b/modules/insights/private-link-scope/main.json similarity index 100% rename from modules/insights/private-link-scopes/main.json rename to modules/insights/private-link-scope/main.json diff --git a/modules/insights/private-link-scopes/scoped-resources/README.md b/modules/insights/private-link-scope/scoped-resources/README.md similarity index 100% rename from modules/insights/private-link-scopes/scoped-resources/README.md rename to modules/insights/private-link-scope/scoped-resources/README.md diff --git a/modules/insights/private-link-scopes/scoped-resources/main.bicep b/modules/insights/private-link-scope/scoped-resources/main.bicep similarity index 100% rename from modules/insights/private-link-scopes/scoped-resources/main.bicep rename to modules/insights/private-link-scope/scoped-resources/main.bicep diff --git a/modules/insights/private-link-scopes/scoped-resources/main.json b/modules/insights/private-link-scope/scoped-resources/main.json similarity index 100% rename from modules/insights/private-link-scopes/scoped-resources/main.json rename to modules/insights/private-link-scope/scoped-resources/main.json diff --git a/modules/insights/private-link-scopes/scoped-resources/version.json b/modules/insights/private-link-scope/scoped-resources/version.json similarity index 100% rename from modules/insights/private-link-scopes/scoped-resources/version.json rename to modules/insights/private-link-scope/scoped-resources/version.json diff --git a/modules/insights/private-link-scopes/version.json b/modules/insights/private-link-scope/version.json similarity index 100% rename from modules/insights/private-link-scopes/version.json rename to modules/insights/private-link-scope/version.json diff --git a/modules/insights/scheduled-query-rules/.bicep/nested_roleAssignments.bicep b/modules/insights/scheduled-query-rule/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/insights/scheduled-query-rules/.bicep/nested_roleAssignments.bicep rename to modules/insights/scheduled-query-rule/.bicep/nested_roleAssignments.bicep diff --git a/modules/insights/scheduled-query-rules/.test/common/dependencies.bicep b/modules/insights/scheduled-query-rule/.test/common/dependencies.bicep similarity index 100% rename from modules/insights/scheduled-query-rules/.test/common/dependencies.bicep rename to modules/insights/scheduled-query-rule/.test/common/dependencies.bicep diff --git a/modules/insights/scheduled-query-rules/.test/common/main.test.bicep b/modules/insights/scheduled-query-rule/.test/common/main.test.bicep similarity index 100% rename from modules/insights/scheduled-query-rules/.test/common/main.test.bicep rename to modules/insights/scheduled-query-rule/.test/common/main.test.bicep diff --git a/modules/insights/scheduled-query-rules/.test/main.test.bicep b/modules/insights/scheduled-query-rule/.test/main.test.bicep similarity index 100% rename from modules/insights/scheduled-query-rules/.test/main.test.bicep rename to modules/insights/scheduled-query-rule/.test/main.test.bicep diff --git a/modules/insights/scheduled-query-rules/README.md b/modules/insights/scheduled-query-rule/README.md similarity index 99% rename from modules/insights/scheduled-query-rules/README.md rename to modules/insights/scheduled-query-rule/README.md index 88b1ba0fbb..911d3a000b 100644 --- a/modules/insights/scheduled-query-rules/README.md +++ b/modules/insights/scheduled-query-rule/README.md @@ -176,7 +176,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module scheduledQueryRules './insights/scheduled-query-rules/main.bicep' = { +module scheduledQueryRules './insights/scheduled-query-rule/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-isqrcom' params: { // Required parameters diff --git a/modules/insights/scheduled-query-rules/main.bicep b/modules/insights/scheduled-query-rule/main.bicep similarity index 100% rename from modules/insights/scheduled-query-rules/main.bicep rename to modules/insights/scheduled-query-rule/main.bicep diff --git a/modules/insights/scheduled-query-rules/main.json b/modules/insights/scheduled-query-rule/main.json similarity index 100% rename from modules/insights/scheduled-query-rules/main.json rename to modules/insights/scheduled-query-rule/main.json diff --git a/modules/insights/scheduled-query-rules/version.json b/modules/insights/scheduled-query-rule/version.json similarity index 100% rename from modules/insights/scheduled-query-rules/version.json rename to modules/insights/scheduled-query-rule/version.json diff --git a/modules/insights/webtests/.bicep/nested_roleAssignments.bicep b/modules/insights/webtest/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/insights/webtests/.bicep/nested_roleAssignments.bicep rename to modules/insights/webtest/.bicep/nested_roleAssignments.bicep diff --git a/modules/insights/webtests/.test/common/dependencies.bicep b/modules/insights/webtest/.test/common/dependencies.bicep similarity index 100% rename from modules/insights/webtests/.test/common/dependencies.bicep rename to modules/insights/webtest/.test/common/dependencies.bicep diff --git a/modules/insights/webtests/.test/common/main.test.bicep b/modules/insights/webtest/.test/common/main.test.bicep similarity index 100% rename from modules/insights/webtests/.test/common/main.test.bicep rename to modules/insights/webtest/.test/common/main.test.bicep diff --git a/modules/insights/webtests/.test/main.test.bicep b/modules/insights/webtest/.test/main.test.bicep similarity index 100% rename from modules/insights/webtests/.test/main.test.bicep rename to modules/insights/webtest/.test/main.test.bicep diff --git a/modules/insights/webtests/.test/min/dependencies.bicep b/modules/insights/webtest/.test/min/dependencies.bicep similarity index 100% rename from modules/insights/webtests/.test/min/dependencies.bicep rename to modules/insights/webtest/.test/min/dependencies.bicep diff --git a/modules/insights/webtests/.test/min/main.test.bicep b/modules/insights/webtest/.test/min/main.test.bicep similarity index 100% rename from modules/insights/webtests/.test/min/main.test.bicep rename to modules/insights/webtest/.test/min/main.test.bicep diff --git a/modules/insights/webtests/README.md b/modules/insights/webtest/README.md similarity index 98% rename from modules/insights/webtests/README.md rename to modules/insights/webtest/README.md index 6f35dab74b..f0cdfcabbb 100644 --- a/modules/insights/webtests/README.md +++ b/modules/insights/webtest/README.md @@ -176,7 +176,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module webtests './insights/webtests/main.bicep' = { +module webtests './insights/webtest/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-iwtcom' params: { // Required parameters @@ -263,7 +263,7 @@ module webtests './insights/webtests/main.bicep' = { via Bicep module ```bicep -module webtests './insights/webtests/main.bicep' = { +module webtests './insights/webtest/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-iwtmin' params: { // Required parameters diff --git a/modules/insights/webtests/main.bicep b/modules/insights/webtest/main.bicep similarity index 100% rename from modules/insights/webtests/main.bicep rename to modules/insights/webtest/main.bicep diff --git a/modules/insights/webtests/main.json b/modules/insights/webtest/main.json similarity index 100% rename from modules/insights/webtests/main.json rename to modules/insights/webtest/main.json diff --git a/modules/insights/webtests/version.json b/modules/insights/webtest/version.json similarity index 100% rename from modules/insights/webtests/version.json rename to modules/insights/webtest/version.json diff --git a/modules/key-vault/vaults/.bicep/nested_roleAssignments.bicep b/modules/key-vault/vault/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/key-vault/vaults/.bicep/nested_roleAssignments.bicep rename to modules/key-vault/vault/.bicep/nested_roleAssignments.bicep diff --git a/modules/key-vault/vaults/.test/common/dependencies.bicep b/modules/key-vault/vault/.test/common/dependencies.bicep similarity index 100% rename from modules/key-vault/vaults/.test/common/dependencies.bicep rename to modules/key-vault/vault/.test/common/dependencies.bicep diff --git a/modules/key-vault/vaults/.test/common/main.test.bicep b/modules/key-vault/vault/.test/common/main.test.bicep similarity index 100% rename from modules/key-vault/vaults/.test/common/main.test.bicep rename to modules/key-vault/vault/.test/common/main.test.bicep diff --git a/modules/key-vault/vaults/.test/main.test.bicep b/modules/key-vault/vault/.test/main.test.bicep similarity index 100% rename from modules/key-vault/vaults/.test/main.test.bicep rename to modules/key-vault/vault/.test/main.test.bicep diff --git a/modules/key-vault/vaults/.test/min/main.test.bicep b/modules/key-vault/vault/.test/min/main.test.bicep similarity index 100% rename from modules/key-vault/vaults/.test/min/main.test.bicep rename to modules/key-vault/vault/.test/min/main.test.bicep diff --git a/modules/key-vault/vaults/.test/pe/dependencies.bicep b/modules/key-vault/vault/.test/pe/dependencies.bicep similarity index 100% rename from modules/key-vault/vaults/.test/pe/dependencies.bicep rename to modules/key-vault/vault/.test/pe/dependencies.bicep diff --git a/modules/key-vault/vaults/.test/pe/main.test.bicep b/modules/key-vault/vault/.test/pe/main.test.bicep similarity index 100% rename from modules/key-vault/vaults/.test/pe/main.test.bicep rename to modules/key-vault/vault/.test/pe/main.test.bicep diff --git a/modules/key-vault/vaults/README.md b/modules/key-vault/vault/README.md similarity index 99% rename from modules/key-vault/vaults/README.md rename to modules/key-vault/vault/README.md index 3aafe78522..e328656478 100644 --- a/modules/key-vault/vaults/README.md +++ b/modules/key-vault/vault/README.md @@ -410,7 +410,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module vaults './key-vault/vaults/main.bicep' = { +module vaults './key-vault/vault/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-kvvcom' params: { name: 'kvvcom002' @@ -763,7 +763,7 @@ module vaults './key-vault/vaults/main.bicep' = { via Bicep module ```bicep -module vaults './key-vault/vaults/main.bicep' = { +module vaults './key-vault/vault/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-kvvmin' params: { // Required parameters @@ -812,7 +812,7 @@ module vaults './key-vault/vaults/main.bicep' = { via Bicep module ```bicep -module vaults './key-vault/vaults/main.bicep' = { +module vaults './key-vault/vault/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-kvvpe' params: { // Required parameters diff --git a/modules/key-vault/vaults/access-policies/README.md b/modules/key-vault/vault/access-policies/README.md similarity index 100% rename from modules/key-vault/vaults/access-policies/README.md rename to modules/key-vault/vault/access-policies/README.md diff --git a/modules/key-vault/vaults/access-policies/main.bicep b/modules/key-vault/vault/access-policies/main.bicep similarity index 100% rename from modules/key-vault/vaults/access-policies/main.bicep rename to modules/key-vault/vault/access-policies/main.bicep diff --git a/modules/key-vault/vaults/access-policies/main.json b/modules/key-vault/vault/access-policies/main.json similarity index 100% rename from modules/key-vault/vaults/access-policies/main.json rename to modules/key-vault/vault/access-policies/main.json diff --git a/modules/key-vault/vaults/access-policies/version.json b/modules/key-vault/vault/access-policies/version.json similarity index 100% rename from modules/key-vault/vaults/access-policies/version.json rename to modules/key-vault/vault/access-policies/version.json diff --git a/modules/key-vault/vaults/keys/.bicep/nested_roleAssignments.bicep b/modules/key-vault/vault/keys/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/key-vault/vaults/keys/.bicep/nested_roleAssignments.bicep rename to modules/key-vault/vault/keys/.bicep/nested_roleAssignments.bicep diff --git a/modules/key-vault/vaults/keys/README.md b/modules/key-vault/vault/keys/README.md similarity index 100% rename from modules/key-vault/vaults/keys/README.md rename to modules/key-vault/vault/keys/README.md diff --git a/modules/key-vault/vaults/keys/main.bicep b/modules/key-vault/vault/keys/main.bicep similarity index 100% rename from modules/key-vault/vaults/keys/main.bicep rename to modules/key-vault/vault/keys/main.bicep diff --git a/modules/key-vault/vaults/keys/main.json b/modules/key-vault/vault/keys/main.json similarity index 100% rename from modules/key-vault/vaults/keys/main.json rename to modules/key-vault/vault/keys/main.json diff --git a/modules/key-vault/vaults/keys/version.json b/modules/key-vault/vault/keys/version.json similarity index 100% rename from modules/key-vault/vaults/keys/version.json rename to modules/key-vault/vault/keys/version.json diff --git a/modules/key-vault/vaults/main.bicep b/modules/key-vault/vault/main.bicep similarity index 97% rename from modules/key-vault/vaults/main.bicep rename to modules/key-vault/vault/main.bicep index 17f1f5224a..7a530242f1 100644 --- a/modules/key-vault/vaults/main.bicep +++ b/modules/key-vault/vault/main.bicep @@ -233,7 +233,7 @@ resource keyVault_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@2021 scope: keyVault } -module keyVault_accessPolicies 'access-policies/main.bicep' = if (!empty(accessPolicies)) { +module keyVault_accessPolicies 'access-policy/main.bicep' = if (!empty(accessPolicies)) { name: '${uniqueString(deployment().name, location)}-KeyVault-AccessPolicies' params: { keyVaultName: keyVault.name @@ -242,7 +242,7 @@ module keyVault_accessPolicies 'access-policies/main.bicep' = if (!empty(accessP } } -module keyVault_secrets 'secrets/main.bicep' = [for (secret, index) in secretList: { +module keyVault_secrets 'secret/main.bicep' = [for (secret, index) in secretList: { name: '${uniqueString(deployment().name, location)}-KeyVault-Secret-${index}' params: { name: secret.name @@ -258,7 +258,7 @@ module keyVault_secrets 'secrets/main.bicep' = [for (secret, index) in secretLis } }] -module keyVault_keys 'keys/main.bicep' = [for (key, index) in keys: { +module keyVault_keys 'key/main.bicep' = [for (key, index) in keys: { name: '${uniqueString(deployment().name, location)}-KeyVault-Key-${index}' params: { name: key.name @@ -277,7 +277,7 @@ module keyVault_keys 'keys/main.bicep' = [for (key, index) in keys: { } }] -module keyVault_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module keyVault_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-KeyVault-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/key-vault/vaults/main.json b/modules/key-vault/vault/main.json similarity index 100% rename from modules/key-vault/vaults/main.json rename to modules/key-vault/vault/main.json diff --git a/modules/key-vault/vaults/secrets/.bicep/nested_roleAssignments.bicep b/modules/key-vault/vault/secrets/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/key-vault/vaults/secrets/.bicep/nested_roleAssignments.bicep rename to modules/key-vault/vault/secrets/.bicep/nested_roleAssignments.bicep diff --git a/modules/key-vault/vaults/secrets/README.md b/modules/key-vault/vault/secrets/README.md similarity index 100% rename from modules/key-vault/vaults/secrets/README.md rename to modules/key-vault/vault/secrets/README.md diff --git a/modules/key-vault/vaults/secrets/main.bicep b/modules/key-vault/vault/secrets/main.bicep similarity index 100% rename from modules/key-vault/vaults/secrets/main.bicep rename to modules/key-vault/vault/secrets/main.bicep diff --git a/modules/key-vault/vaults/secrets/main.json b/modules/key-vault/vault/secrets/main.json similarity index 100% rename from modules/key-vault/vaults/secrets/main.json rename to modules/key-vault/vault/secrets/main.json diff --git a/modules/key-vault/vaults/secrets/version.json b/modules/key-vault/vault/secrets/version.json similarity index 100% rename from modules/key-vault/vaults/secrets/version.json rename to modules/key-vault/vault/secrets/version.json diff --git a/modules/key-vault/vaults/version.json b/modules/key-vault/vault/version.json similarity index 100% rename from modules/key-vault/vaults/version.json rename to modules/key-vault/vault/version.json diff --git a/modules/kubernetes-configuration/extensions/.test/common/dependencies.bicep b/modules/kubernetes-configuration/extension/.test/common/dependencies.bicep similarity index 100% rename from modules/kubernetes-configuration/extensions/.test/common/dependencies.bicep rename to modules/kubernetes-configuration/extension/.test/common/dependencies.bicep diff --git a/modules/kubernetes-configuration/extensions/.test/common/main.test.bicep b/modules/kubernetes-configuration/extension/.test/common/main.test.bicep similarity index 100% rename from modules/kubernetes-configuration/extensions/.test/common/main.test.bicep rename to modules/kubernetes-configuration/extension/.test/common/main.test.bicep diff --git a/modules/kubernetes-configuration/extensions/.test/main.test.bicep b/modules/kubernetes-configuration/extension/.test/main.test.bicep similarity index 100% rename from modules/kubernetes-configuration/extensions/.test/main.test.bicep rename to modules/kubernetes-configuration/extension/.test/main.test.bicep diff --git a/modules/kubernetes-configuration/extensions/.test/min/dependencies.bicep b/modules/kubernetes-configuration/extension/.test/min/dependencies.bicep similarity index 100% rename from modules/kubernetes-configuration/extensions/.test/min/dependencies.bicep rename to modules/kubernetes-configuration/extension/.test/min/dependencies.bicep diff --git a/modules/kubernetes-configuration/extensions/.test/min/main.test.bicep b/modules/kubernetes-configuration/extension/.test/min/main.test.bicep similarity index 100% rename from modules/kubernetes-configuration/extensions/.test/min/main.test.bicep rename to modules/kubernetes-configuration/extension/.test/min/main.test.bicep diff --git a/modules/kubernetes-configuration/extensions/README.md b/modules/kubernetes-configuration/extension/README.md similarity index 98% rename from modules/kubernetes-configuration/extensions/README.md rename to modules/kubernetes-configuration/extension/README.md index 437cce9be8..f39f509041 100644 --- a/modules/kubernetes-configuration/extensions/README.md +++ b/modules/kubernetes-configuration/extension/README.md @@ -91,7 +91,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module extensions './kubernetes-configuration/extensions/main.bicep' = { +module extensions './kubernetes-configuration/extension/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-kcecom' params: { // Required parameters @@ -202,7 +202,7 @@ module extensions './kubernetes-configuration/extensions/main.bicep' = { via Bicep module ```bicep -module extensions './kubernetes-configuration/extensions/main.bicep' = { +module extensions './kubernetes-configuration/extension/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-kcemin' params: { // Required parameters diff --git a/modules/kubernetes-configuration/extensions/main.bicep b/modules/kubernetes-configuration/extension/main.bicep similarity index 98% rename from modules/kubernetes-configuration/extensions/main.bicep rename to modules/kubernetes-configuration/extension/main.bicep index 27aa397b3c..6ea377171d 100644 --- a/modules/kubernetes-configuration/extensions/main.bicep +++ b/modules/kubernetes-configuration/extension/main.bicep @@ -76,7 +76,7 @@ resource extension 'Microsoft.KubernetesConfiguration/extensions@2022-03-01' = { } } -module fluxConfiguration '../../kubernetes-configuration/flux-configurations/main.bicep' = [for (fluxConfiguration, index) in fluxConfigurations: { +module fluxConfiguration '../../kubernetes-configuration/flux-configuration/main.bicep' = [for (fluxConfiguration, index) in fluxConfigurations: { name: '${uniqueString(deployment().name, location)}-ManagedCluster-FluxConfiguration${index}' params: { enableDefaultTelemetry: enableDefaultTelemetry diff --git a/modules/kubernetes-configuration/extensions/main.json b/modules/kubernetes-configuration/extension/main.json similarity index 100% rename from modules/kubernetes-configuration/extensions/main.json rename to modules/kubernetes-configuration/extension/main.json diff --git a/modules/kubernetes-configuration/extensions/version.json b/modules/kubernetes-configuration/extension/version.json similarity index 100% rename from modules/kubernetes-configuration/extensions/version.json rename to modules/kubernetes-configuration/extension/version.json diff --git a/modules/kubernetes-configuration/flux-configurations/.test/common/dependencies.bicep b/modules/kubernetes-configuration/flux-configuration/.test/common/dependencies.bicep similarity index 100% rename from modules/kubernetes-configuration/flux-configurations/.test/common/dependencies.bicep rename to modules/kubernetes-configuration/flux-configuration/.test/common/dependencies.bicep diff --git a/modules/kubernetes-configuration/flux-configurations/.test/common/main.test.bicep b/modules/kubernetes-configuration/flux-configuration/.test/common/main.test.bicep similarity index 100% rename from modules/kubernetes-configuration/flux-configurations/.test/common/main.test.bicep rename to modules/kubernetes-configuration/flux-configuration/.test/common/main.test.bicep diff --git a/modules/kubernetes-configuration/flux-configurations/.test/main.test.bicep b/modules/kubernetes-configuration/flux-configuration/.test/main.test.bicep similarity index 100% rename from modules/kubernetes-configuration/flux-configurations/.test/main.test.bicep rename to modules/kubernetes-configuration/flux-configuration/.test/main.test.bicep diff --git a/modules/kubernetes-configuration/flux-configurations/.test/min/dependencies.bicep b/modules/kubernetes-configuration/flux-configuration/.test/min/dependencies.bicep similarity index 100% rename from modules/kubernetes-configuration/flux-configurations/.test/min/dependencies.bicep rename to modules/kubernetes-configuration/flux-configuration/.test/min/dependencies.bicep diff --git a/modules/kubernetes-configuration/flux-configurations/.test/min/main.test.bicep b/modules/kubernetes-configuration/flux-configuration/.test/min/main.test.bicep similarity index 100% rename from modules/kubernetes-configuration/flux-configurations/.test/min/main.test.bicep rename to modules/kubernetes-configuration/flux-configuration/.test/min/main.test.bicep diff --git a/modules/kubernetes-configuration/flux-configurations/README.md b/modules/kubernetes-configuration/flux-configuration/README.md similarity index 99% rename from modules/kubernetes-configuration/flux-configurations/README.md rename to modules/kubernetes-configuration/flux-configuration/README.md index 8f6ff685e5..655ad47fea 100644 --- a/modules/kubernetes-configuration/flux-configurations/README.md +++ b/modules/kubernetes-configuration/flux-configuration/README.md @@ -86,7 +86,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module fluxConfigurations './kubernetes-configuration/flux-configurations/main.bicep' = { +module fluxConfigurations './kubernetes-configuration/flux-configuration/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-kcfccom' params: { // Required parameters @@ -185,7 +185,7 @@ module fluxConfigurations './kubernetes-configuration/flux-configurations/main.b via Bicep module ```bicep -module fluxConfigurations './kubernetes-configuration/flux-configurations/main.bicep' = { +module fluxConfigurations './kubernetes-configuration/flux-configuration/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-kcfcmin' params: { // Required parameters diff --git a/modules/kubernetes-configuration/flux-configurations/main.bicep b/modules/kubernetes-configuration/flux-configuration/main.bicep similarity index 100% rename from modules/kubernetes-configuration/flux-configurations/main.bicep rename to modules/kubernetes-configuration/flux-configuration/main.bicep diff --git a/modules/kubernetes-configuration/flux-configurations/main.json b/modules/kubernetes-configuration/flux-configuration/main.json similarity index 100% rename from modules/kubernetes-configuration/flux-configurations/main.json rename to modules/kubernetes-configuration/flux-configuration/main.json diff --git a/modules/kubernetes-configuration/flux-configurations/version.json b/modules/kubernetes-configuration/flux-configuration/version.json similarity index 100% rename from modules/kubernetes-configuration/flux-configurations/version.json rename to modules/kubernetes-configuration/flux-configuration/version.json diff --git a/modules/logic/workflows/.bicep/nested_roleAssignments.bicep b/modules/logic/workflow/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/logic/workflows/.bicep/nested_roleAssignments.bicep rename to modules/logic/workflow/.bicep/nested_roleAssignments.bicep diff --git a/modules/logic/workflows/.test/common/dependencies.bicep b/modules/logic/workflow/.test/common/dependencies.bicep similarity index 100% rename from modules/logic/workflows/.test/common/dependencies.bicep rename to modules/logic/workflow/.test/common/dependencies.bicep diff --git a/modules/logic/workflows/.test/common/main.test.bicep b/modules/logic/workflow/.test/common/main.test.bicep similarity index 100% rename from modules/logic/workflows/.test/common/main.test.bicep rename to modules/logic/workflow/.test/common/main.test.bicep diff --git a/modules/logic/workflows/.test/main.test.bicep b/modules/logic/workflow/.test/main.test.bicep similarity index 100% rename from modules/logic/workflows/.test/main.test.bicep rename to modules/logic/workflow/.test/main.test.bicep diff --git a/modules/logic/workflows/README.md b/modules/logic/workflow/README.md similarity index 99% rename from modules/logic/workflows/README.md rename to modules/logic/workflow/README.md index c396b5ef62..7f7fdafc85 100644 --- a/modules/logic/workflows/README.md +++ b/modules/logic/workflow/README.md @@ -331,7 +331,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module workflows './logic/workflows/main.bicep' = { +module workflows './logic/workflow/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-lwcom' params: { // Required parameters diff --git a/modules/logic/workflows/main.bicep b/modules/logic/workflow/main.bicep similarity index 100% rename from modules/logic/workflows/main.bicep rename to modules/logic/workflow/main.bicep diff --git a/modules/logic/workflows/main.json b/modules/logic/workflow/main.json similarity index 100% rename from modules/logic/workflows/main.json rename to modules/logic/workflow/main.json diff --git a/modules/logic/workflows/version.json b/modules/logic/workflow/version.json similarity index 100% rename from modules/logic/workflows/version.json rename to modules/logic/workflow/version.json diff --git a/modules/machine-learning-services/workspaces/.bicep/nested_roleAssignments.bicep b/modules/machine-learning-services/workspace/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/machine-learning-services/workspaces/.bicep/nested_roleAssignments.bicep rename to modules/machine-learning-services/workspace/.bicep/nested_roleAssignments.bicep diff --git a/modules/machine-learning-services/workspaces/.test/common/dependencies.bicep b/modules/machine-learning-services/workspace/.test/common/dependencies.bicep similarity index 100% rename from modules/machine-learning-services/workspaces/.test/common/dependencies.bicep rename to modules/machine-learning-services/workspace/.test/common/dependencies.bicep diff --git a/modules/machine-learning-services/workspaces/.test/common/main.test.bicep b/modules/machine-learning-services/workspace/.test/common/main.test.bicep similarity index 100% rename from modules/machine-learning-services/workspaces/.test/common/main.test.bicep rename to modules/machine-learning-services/workspace/.test/common/main.test.bicep diff --git a/modules/machine-learning-services/workspaces/.test/encr/dependencies.bicep b/modules/machine-learning-services/workspace/.test/encr/dependencies.bicep similarity index 100% rename from modules/machine-learning-services/workspaces/.test/encr/dependencies.bicep rename to modules/machine-learning-services/workspace/.test/encr/dependencies.bicep diff --git a/modules/machine-learning-services/workspaces/.test/encr/main.test.bicep b/modules/machine-learning-services/workspace/.test/encr/main.test.bicep similarity index 100% rename from modules/machine-learning-services/workspaces/.test/encr/main.test.bicep rename to modules/machine-learning-services/workspace/.test/encr/main.test.bicep diff --git a/modules/machine-learning-services/workspaces/.test/main.test.bicep b/modules/machine-learning-services/workspace/.test/main.test.bicep similarity index 100% rename from modules/machine-learning-services/workspaces/.test/main.test.bicep rename to modules/machine-learning-services/workspace/.test/main.test.bicep diff --git a/modules/machine-learning-services/workspaces/.test/min/dependencies.bicep b/modules/machine-learning-services/workspace/.test/min/dependencies.bicep similarity index 100% rename from modules/machine-learning-services/workspaces/.test/min/dependencies.bicep rename to modules/machine-learning-services/workspace/.test/min/dependencies.bicep diff --git a/modules/machine-learning-services/workspaces/.test/min/main.test.bicep b/modules/machine-learning-services/workspace/.test/min/main.test.bicep similarity index 100% rename from modules/machine-learning-services/workspaces/.test/min/main.test.bicep rename to modules/machine-learning-services/workspace/.test/min/main.test.bicep diff --git a/modules/machine-learning-services/workspaces/README.md b/modules/machine-learning-services/workspace/README.md similarity index 99% rename from modules/machine-learning-services/workspaces/README.md rename to modules/machine-learning-services/workspace/README.md index b8fa0f0ab4..8be6886df1 100644 --- a/modules/machine-learning-services/workspaces/README.md +++ b/modules/machine-learning-services/workspace/README.md @@ -447,7 +447,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module workspaces './machine-learning-services/workspaces/main.bicep' = { +module workspaces './machine-learning-services/workspace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-mlswcom' params: { // Required parameters @@ -680,7 +680,7 @@ module workspaces './machine-learning-services/workspaces/main.bicep' = { via Bicep module ```bicep -module workspaces './machine-learning-services/workspaces/main.bicep' = { +module workspaces './machine-learning-services/workspace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-mlswecr' params: { // Required parameters @@ -811,7 +811,7 @@ module workspaces './machine-learning-services/workspaces/main.bicep' = { via Bicep module ```bicep -module workspaces './machine-learning-services/workspaces/main.bicep' = { +module workspaces './machine-learning-services/workspace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-mlswmin' params: { // Required parameters diff --git a/modules/machine-learning-services/workspaces/computes/README.md b/modules/machine-learning-services/workspace/computes/README.md similarity index 100% rename from modules/machine-learning-services/workspaces/computes/README.md rename to modules/machine-learning-services/workspace/computes/README.md diff --git a/modules/machine-learning-services/workspaces/computes/main.bicep b/modules/machine-learning-services/workspace/computes/main.bicep similarity index 100% rename from modules/machine-learning-services/workspaces/computes/main.bicep rename to modules/machine-learning-services/workspace/computes/main.bicep diff --git a/modules/machine-learning-services/workspaces/computes/main.json b/modules/machine-learning-services/workspace/computes/main.json similarity index 100% rename from modules/machine-learning-services/workspaces/computes/main.json rename to modules/machine-learning-services/workspace/computes/main.json diff --git a/modules/machine-learning-services/workspaces/computes/version.json b/modules/machine-learning-services/workspace/computes/version.json similarity index 100% rename from modules/machine-learning-services/workspaces/computes/version.json rename to modules/machine-learning-services/workspace/computes/version.json diff --git a/modules/machine-learning-services/workspaces/main.bicep b/modules/machine-learning-services/workspace/main.bicep similarity index 99% rename from modules/machine-learning-services/workspaces/main.bicep rename to modules/machine-learning-services/workspace/main.bicep index e5e68a7479..7056db4f7d 100644 --- a/modules/machine-learning-services/workspaces/main.bicep +++ b/modules/machine-learning-services/workspace/main.bicep @@ -248,7 +248,7 @@ resource workspace 'Microsoft.MachineLearningServices/workspaces@2022-10-01' = { } } -module workspace_computes 'computes/main.bicep' = [for compute in computes: { +module workspace_computes 'compute/main.bicep' = [for compute in computes: { name: '${workspace.name}-${compute.name}-compute' params: { machineLearningWorkspaceName: workspace.name @@ -290,7 +290,7 @@ resource workspace_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@202 scope: workspace } -module workspace_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module workspace_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-Workspace-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/machine-learning-services/workspaces/main.json b/modules/machine-learning-services/workspace/main.json similarity index 100% rename from modules/machine-learning-services/workspaces/main.json rename to modules/machine-learning-services/workspace/main.json diff --git a/modules/machine-learning-services/workspaces/version.json b/modules/machine-learning-services/workspace/version.json similarity index 100% rename from modules/machine-learning-services/workspaces/version.json rename to modules/machine-learning-services/workspace/version.json diff --git a/modules/maintenance/maintenance-configurations/.bicep/nested_roleAssignments.bicep b/modules/maintenance/maintenance-configuration/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/maintenance/maintenance-configurations/.bicep/nested_roleAssignments.bicep rename to modules/maintenance/maintenance-configuration/.bicep/nested_roleAssignments.bicep diff --git a/modules/maintenance/maintenance-configurations/.test/common/dependencies.bicep b/modules/maintenance/maintenance-configuration/.test/common/dependencies.bicep similarity index 100% rename from modules/maintenance/maintenance-configurations/.test/common/dependencies.bicep rename to modules/maintenance/maintenance-configuration/.test/common/dependencies.bicep diff --git a/modules/maintenance/maintenance-configurations/.test/common/main.test.bicep b/modules/maintenance/maintenance-configuration/.test/common/main.test.bicep similarity index 100% rename from modules/maintenance/maintenance-configurations/.test/common/main.test.bicep rename to modules/maintenance/maintenance-configuration/.test/common/main.test.bicep diff --git a/modules/maintenance/maintenance-configurations/.test/main.test.bicep b/modules/maintenance/maintenance-configuration/.test/main.test.bicep similarity index 100% rename from modules/maintenance/maintenance-configurations/.test/main.test.bicep rename to modules/maintenance/maintenance-configuration/.test/main.test.bicep diff --git a/modules/maintenance/maintenance-configurations/.test/min/main.test.bicep b/modules/maintenance/maintenance-configuration/.test/min/main.test.bicep similarity index 100% rename from modules/maintenance/maintenance-configurations/.test/min/main.test.bicep rename to modules/maintenance/maintenance-configuration/.test/min/main.test.bicep diff --git a/modules/maintenance/maintenance-configurations/README.md b/modules/maintenance/maintenance-configuration/README.md similarity index 99% rename from modules/maintenance/maintenance-configurations/README.md rename to modules/maintenance/maintenance-configuration/README.md index b5f9a9fa19..35fcd330a7 100644 --- a/modules/maintenance/maintenance-configurations/README.md +++ b/modules/maintenance/maintenance-configuration/README.md @@ -205,7 +205,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module maintenanceConfigurations './maintenance/maintenance-configurations/main.bicep' = { +module maintenanceConfigurations './maintenance/maintenance-configuration/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-mmccom' params: { // Required parameters @@ -312,7 +312,7 @@ module maintenanceConfigurations './maintenance/maintenance-configurations/main. via Bicep module ```bicep -module maintenanceConfigurations './maintenance/maintenance-configurations/main.bicep' = { +module maintenanceConfigurations './maintenance/maintenance-configuration/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-mmcmin' params: { // Required parameters diff --git a/modules/maintenance/maintenance-configurations/main.bicep b/modules/maintenance/maintenance-configuration/main.bicep similarity index 100% rename from modules/maintenance/maintenance-configurations/main.bicep rename to modules/maintenance/maintenance-configuration/main.bicep diff --git a/modules/maintenance/maintenance-configurations/main.json b/modules/maintenance/maintenance-configuration/main.json similarity index 100% rename from modules/maintenance/maintenance-configurations/main.json rename to modules/maintenance/maintenance-configuration/main.json diff --git a/modules/maintenance/maintenance-configurations/version.json b/modules/maintenance/maintenance-configuration/version.json similarity index 100% rename from modules/maintenance/maintenance-configurations/version.json rename to modules/maintenance/maintenance-configuration/version.json diff --git a/modules/managed-identity/user-assigned-identities/.bicep/nested_roleAssignments.bicep b/modules/managed-identity/user-assigned-identity/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/managed-identity/user-assigned-identities/.bicep/nested_roleAssignments.bicep rename to modules/managed-identity/user-assigned-identity/.bicep/nested_roleAssignments.bicep diff --git a/modules/managed-identity/user-assigned-identities/.test/common/dependencies.bicep b/modules/managed-identity/user-assigned-identity/.test/common/dependencies.bicep similarity index 100% rename from modules/managed-identity/user-assigned-identities/.test/common/dependencies.bicep rename to modules/managed-identity/user-assigned-identity/.test/common/dependencies.bicep diff --git a/modules/managed-identity/user-assigned-identities/.test/common/main.test.bicep b/modules/managed-identity/user-assigned-identity/.test/common/main.test.bicep similarity index 100% rename from modules/managed-identity/user-assigned-identities/.test/common/main.test.bicep rename to modules/managed-identity/user-assigned-identity/.test/common/main.test.bicep diff --git a/modules/managed-identity/user-assigned-identities/.test/main.test.bicep b/modules/managed-identity/user-assigned-identity/.test/main.test.bicep similarity index 100% rename from modules/managed-identity/user-assigned-identities/.test/main.test.bicep rename to modules/managed-identity/user-assigned-identity/.test/main.test.bicep diff --git a/modules/managed-identity/user-assigned-identities/README.md b/modules/managed-identity/user-assigned-identity/README.md similarity index 99% rename from modules/managed-identity/user-assigned-identities/README.md rename to modules/managed-identity/user-assigned-identity/README.md index 84c8cce2cb..9a47a1fcea 100644 --- a/modules/managed-identity/user-assigned-identities/README.md +++ b/modules/managed-identity/user-assigned-identity/README.md @@ -161,7 +161,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module userAssignedIdentities './managed-identity/user-assigned-identities/main.bicep' = { +module userAssignedIdentities './managed-identity/user-assigned-identity/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-miuaicom' params: { enableDefaultTelemetry: '' diff --git a/modules/managed-identity/user-assigned-identities/main.bicep b/modules/managed-identity/user-assigned-identity/main.bicep similarity index 100% rename from modules/managed-identity/user-assigned-identities/main.bicep rename to modules/managed-identity/user-assigned-identity/main.bicep diff --git a/modules/managed-identity/user-assigned-identities/main.json b/modules/managed-identity/user-assigned-identity/main.json similarity index 100% rename from modules/managed-identity/user-assigned-identities/main.json rename to modules/managed-identity/user-assigned-identity/main.json diff --git a/modules/managed-identity/user-assigned-identities/version.json b/modules/managed-identity/user-assigned-identity/version.json similarity index 100% rename from modules/managed-identity/user-assigned-identities/version.json rename to modules/managed-identity/user-assigned-identity/version.json diff --git a/modules/managed-services/registration-definitions/.bicep/nested_registrationAssignment.bicep b/modules/managed-services/registration-definition/.bicep/nested_registrationAssignment.bicep similarity index 100% rename from modules/managed-services/registration-definitions/.bicep/nested_registrationAssignment.bicep rename to modules/managed-services/registration-definition/.bicep/nested_registrationAssignment.bicep diff --git a/modules/managed-services/registration-definitions/.test/common/main.test.bicep b/modules/managed-services/registration-definition/.test/common/main.test.bicep similarity index 100% rename from modules/managed-services/registration-definitions/.test/common/main.test.bicep rename to modules/managed-services/registration-definition/.test/common/main.test.bicep diff --git a/modules/managed-services/registration-definitions/.test/main.test.bicep b/modules/managed-services/registration-definition/.test/main.test.bicep similarity index 100% rename from modules/managed-services/registration-definitions/.test/main.test.bicep rename to modules/managed-services/registration-definition/.test/main.test.bicep diff --git a/modules/managed-services/registration-definitions/.test/rg/main.test.bicep b/modules/managed-services/registration-definition/.test/rg/main.test.bicep similarity index 100% rename from modules/managed-services/registration-definitions/.test/rg/main.test.bicep rename to modules/managed-services/registration-definition/.test/rg/main.test.bicep diff --git a/modules/managed-services/registration-definitions/README.md b/modules/managed-services/registration-definition/README.md similarity index 99% rename from modules/managed-services/registration-definitions/README.md rename to modules/managed-services/registration-definition/README.md index ee9328e7da..5d5d85fb93 100644 --- a/modules/managed-services/registration-definitions/README.md +++ b/modules/managed-services/registration-definition/README.md @@ -184,7 +184,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module registrationDefinitions './managed-services/registration-definitions/main.bicep' = { +module registrationDefinitions './managed-services/registration-definition/main.bicep' = { name: '${uniqueString(deployment().name)}-test-msrdcom' params: { // Required parameters @@ -273,7 +273,7 @@ module registrationDefinitions './managed-services/registration-definitions/main via Bicep module ```bicep -module registrationDefinitions './managed-services/registration-definitions/main.bicep' = { +module registrationDefinitions './managed-services/registration-definition/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-msrdrg' params: { // Required parameters diff --git a/modules/managed-services/registration-definitions/main.bicep b/modules/managed-services/registration-definition/main.bicep similarity index 100% rename from modules/managed-services/registration-definitions/main.bicep rename to modules/managed-services/registration-definition/main.bicep diff --git a/modules/managed-services/registration-definitions/main.json b/modules/managed-services/registration-definition/main.json similarity index 100% rename from modules/managed-services/registration-definitions/main.json rename to modules/managed-services/registration-definition/main.json diff --git a/modules/managed-services/registration-definitions/version.json b/modules/managed-services/registration-definition/version.json similarity index 100% rename from modules/managed-services/registration-definitions/version.json rename to modules/managed-services/registration-definition/version.json diff --git a/modules/management/management-groups/.test/common/main.test.bicep b/modules/management/management-group/.test/common/main.test.bicep similarity index 100% rename from modules/management/management-groups/.test/common/main.test.bicep rename to modules/management/management-group/.test/common/main.test.bicep diff --git a/modules/management/management-groups/.test/main.test.bicep b/modules/management/management-group/.test/main.test.bicep similarity index 100% rename from modules/management/management-groups/.test/main.test.bicep rename to modules/management/management-group/.test/main.test.bicep diff --git a/modules/management/management-groups/.test/min/main.test.bicep b/modules/management/management-group/.test/min/main.test.bicep similarity index 100% rename from modules/management/management-groups/.test/min/main.test.bicep rename to modules/management/management-group/.test/min/main.test.bicep diff --git a/modules/management/management-groups/README.md b/modules/management/management-group/README.md similarity index 97% rename from modules/management/management-groups/README.md rename to modules/management/management-group/README.md index adee3e5297..538102db67 100644 --- a/modules/management/management-groups/README.md +++ b/modules/management/management-group/README.md @@ -141,7 +141,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module managementGroups './management/management-groups/main.bicep' = { +module managementGroups './management/management-group/main.bicep' = { name: '${uniqueString(deployment().name)}-test-mmgcom' params: { // Required parameters @@ -194,7 +194,7 @@ module managementGroups './management/management-groups/main.bicep' = { via Bicep module ```bicep -module managementGroups './management/management-groups/main.bicep' = { +module managementGroups './management/management-group/main.bicep' = { name: '${uniqueString(deployment().name)}-test-mmgmin' params: { // Required parameters diff --git a/modules/management/management-groups/main.bicep b/modules/management/management-group/main.bicep similarity index 100% rename from modules/management/management-groups/main.bicep rename to modules/management/management-group/main.bicep diff --git a/modules/management/management-groups/main.json b/modules/management/management-group/main.json similarity index 100% rename from modules/management/management-groups/main.json rename to modules/management/management-group/main.json diff --git a/modules/management/management-groups/version.json b/modules/management/management-group/version.json similarity index 100% rename from modules/management/management-groups/version.json rename to modules/management/management-group/version.json diff --git a/modules/net-app/net-app-accounts/.bicep/nested_roleAssignments.bicep b/modules/net-app/net-app-account/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/net-app/net-app-accounts/.bicep/nested_roleAssignments.bicep rename to modules/net-app/net-app-account/.bicep/nested_roleAssignments.bicep diff --git a/modules/net-app/net-app-accounts/.test/main.test.bicep b/modules/net-app/net-app-account/.test/main.test.bicep similarity index 100% rename from modules/net-app/net-app-accounts/.test/main.test.bicep rename to modules/net-app/net-app-account/.test/main.test.bicep diff --git a/modules/net-app/net-app-accounts/.test/min/main.test.bicep b/modules/net-app/net-app-account/.test/min/main.test.bicep similarity index 100% rename from modules/net-app/net-app-accounts/.test/min/main.test.bicep rename to modules/net-app/net-app-account/.test/min/main.test.bicep diff --git a/modules/net-app/net-app-accounts/.test/nfs3/dependencies.bicep b/modules/net-app/net-app-account/.test/nfs3/dependencies.bicep similarity index 100% rename from modules/net-app/net-app-accounts/.test/nfs3/dependencies.bicep rename to modules/net-app/net-app-account/.test/nfs3/dependencies.bicep diff --git a/modules/net-app/net-app-accounts/.test/nfs3/main.test.bicep b/modules/net-app/net-app-account/.test/nfs3/main.test.bicep similarity index 100% rename from modules/net-app/net-app-accounts/.test/nfs3/main.test.bicep rename to modules/net-app/net-app-account/.test/nfs3/main.test.bicep diff --git a/modules/net-app/net-app-accounts/.test/nfs41/dependencies.bicep b/modules/net-app/net-app-account/.test/nfs41/dependencies.bicep similarity index 100% rename from modules/net-app/net-app-accounts/.test/nfs41/dependencies.bicep rename to modules/net-app/net-app-account/.test/nfs41/dependencies.bicep diff --git a/modules/net-app/net-app-accounts/.test/nfs41/main.test.bicep b/modules/net-app/net-app-account/.test/nfs41/main.test.bicep similarity index 100% rename from modules/net-app/net-app-accounts/.test/nfs41/main.test.bicep rename to modules/net-app/net-app-account/.test/nfs41/main.test.bicep diff --git a/modules/net-app/net-app-accounts/README.md b/modules/net-app/net-app-account/README.md similarity index 99% rename from modules/net-app/net-app-accounts/README.md rename to modules/net-app/net-app-account/README.md index c665ea0472..f2f043eb0f 100644 --- a/modules/net-app/net-app-accounts/README.md +++ b/modules/net-app/net-app-account/README.md @@ -207,7 +207,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module netAppAccounts './net-app/net-app-accounts/main.bicep' = { +module netAppAccounts './net-app/net-app-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nanaamin' params: { // Required parameters @@ -252,7 +252,7 @@ module netAppAccounts './net-app/net-app-accounts/main.bicep' = { via Bicep module ```bicep -module netAppAccounts './net-app/net-app-accounts/main.bicep' = { +module netAppAccounts './net-app/net-app-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nanaanfs3' params: { // Required parameters @@ -477,7 +477,7 @@ module netAppAccounts './net-app/net-app-accounts/main.bicep' = { via Bicep module ```bicep -module netAppAccounts './net-app/net-app-accounts/main.bicep' = { +module netAppAccounts './net-app/net-app-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nanaanfs41' params: { // Required parameters diff --git a/modules/net-app/net-app-accounts/capacity-pools/.bicep/nested_roleAssignments.bicep b/modules/net-app/net-app-account/capacity-pools/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/net-app/net-app-accounts/capacity-pools/.bicep/nested_roleAssignments.bicep rename to modules/net-app/net-app-account/capacity-pools/.bicep/nested_roleAssignments.bicep diff --git a/modules/net-app/net-app-accounts/capacity-pools/README.md b/modules/net-app/net-app-account/capacity-pools/README.md similarity index 100% rename from modules/net-app/net-app-accounts/capacity-pools/README.md rename to modules/net-app/net-app-account/capacity-pools/README.md diff --git a/modules/net-app/net-app-accounts/capacity-pools/main.bicep b/modules/net-app/net-app-account/capacity-pools/main.bicep similarity index 98% rename from modules/net-app/net-app-accounts/capacity-pools/main.bicep rename to modules/net-app/net-app-account/capacity-pools/main.bicep index ca5e083edd..f050a52612 100644 --- a/modules/net-app/net-app-accounts/capacity-pools/main.bicep +++ b/modules/net-app/net-app-account/capacity-pools/main.bicep @@ -77,7 +77,7 @@ resource capacityPool 'Microsoft.NetApp/netAppAccounts/capacityPools@2022-09-01' } @batchSize(1) -module capacityPool_volumes 'volumes/main.bicep' = [for (volume, index) in volumes: { +module capacityPool_volumes 'volume/main.bicep' = [for (volume, index) in volumes: { name: '${deployment().name}-Vol-${index}' params: { netAppAccountName: netAppAccount.name diff --git a/modules/net-app/net-app-accounts/capacity-pools/main.json b/modules/net-app/net-app-account/capacity-pools/main.json similarity index 100% rename from modules/net-app/net-app-accounts/capacity-pools/main.json rename to modules/net-app/net-app-account/capacity-pools/main.json diff --git a/modules/net-app/net-app-accounts/capacity-pools/version.json b/modules/net-app/net-app-account/capacity-pools/version.json similarity index 100% rename from modules/net-app/net-app-accounts/capacity-pools/version.json rename to modules/net-app/net-app-account/capacity-pools/version.json diff --git a/modules/net-app/net-app-accounts/capacity-pools/volumes/.bicep/nested_roleAssignments.bicep b/modules/net-app/net-app-account/capacity-pools/volumes/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/net-app/net-app-accounts/capacity-pools/volumes/.bicep/nested_roleAssignments.bicep rename to modules/net-app/net-app-account/capacity-pools/volumes/.bicep/nested_roleAssignments.bicep diff --git a/modules/net-app/net-app-accounts/capacity-pools/volumes/README.md b/modules/net-app/net-app-account/capacity-pools/volumes/README.md similarity index 100% rename from modules/net-app/net-app-accounts/capacity-pools/volumes/README.md rename to modules/net-app/net-app-account/capacity-pools/volumes/README.md diff --git a/modules/net-app/net-app-accounts/capacity-pools/volumes/main.bicep b/modules/net-app/net-app-account/capacity-pools/volumes/main.bicep similarity index 100% rename from modules/net-app/net-app-accounts/capacity-pools/volumes/main.bicep rename to modules/net-app/net-app-account/capacity-pools/volumes/main.bicep diff --git a/modules/net-app/net-app-accounts/capacity-pools/volumes/main.json b/modules/net-app/net-app-account/capacity-pools/volumes/main.json similarity index 100% rename from modules/net-app/net-app-accounts/capacity-pools/volumes/main.json rename to modules/net-app/net-app-account/capacity-pools/volumes/main.json diff --git a/modules/net-app/net-app-accounts/capacity-pools/volumes/version.json b/modules/net-app/net-app-account/capacity-pools/volumes/version.json similarity index 100% rename from modules/net-app/net-app-accounts/capacity-pools/volumes/version.json rename to modules/net-app/net-app-account/capacity-pools/volumes/version.json diff --git a/modules/net-app/net-app-accounts/main.bicep b/modules/net-app/net-app-account/main.bicep similarity index 98% rename from modules/net-app/net-app-accounts/main.bicep rename to modules/net-app/net-app-account/main.bicep index 6928441f06..17b0a19f82 100644 --- a/modules/net-app/net-app-accounts/main.bicep +++ b/modules/net-app/net-app-account/main.bicep @@ -114,7 +114,7 @@ module netAppAccount_roleAssignments '.bicep/nested_roleAssignments.bicep' = [fo } }] -module netAppAccount_capacityPools 'capacity-pools/main.bicep' = [for (capacityPool, index) in capacityPools: { +module netAppAccount_capacityPools 'capacity-pool/main.bicep' = [for (capacityPool, index) in capacityPools: { name: '${uniqueString(deployment().name, location)}-ANFAccount-CapPool-${index}' params: { netAppAccountName: netAppAccount.name diff --git a/modules/net-app/net-app-accounts/main.json b/modules/net-app/net-app-account/main.json similarity index 100% rename from modules/net-app/net-app-accounts/main.json rename to modules/net-app/net-app-account/main.json diff --git a/modules/net-app/net-app-accounts/version.json b/modules/net-app/net-app-account/version.json similarity index 100% rename from modules/net-app/net-app-accounts/version.json rename to modules/net-app/net-app-account/version.json diff --git a/modules/network/application-gateway-web-application-firewall-policies/.test/common/main.test.bicep b/modules/network/application-gateway-web-application-firewall-policy/.test/common/main.test.bicep similarity index 100% rename from modules/network/application-gateway-web-application-firewall-policies/.test/common/main.test.bicep rename to modules/network/application-gateway-web-application-firewall-policy/.test/common/main.test.bicep diff --git a/modules/network/application-gateway-web-application-firewall-policies/.test/main.test.bicep b/modules/network/application-gateway-web-application-firewall-policy/.test/main.test.bicep similarity index 100% rename from modules/network/application-gateway-web-application-firewall-policies/.test/main.test.bicep rename to modules/network/application-gateway-web-application-firewall-policy/.test/main.test.bicep diff --git a/modules/network/application-gateway-web-application-firewall-policies/README.md b/modules/network/application-gateway-web-application-firewall-policy/README.md similarity index 98% rename from modules/network/application-gateway-web-application-firewall-policies/README.md rename to modules/network/application-gateway-web-application-firewall-policy/README.md index 0c82455c86..c8884db8da 100644 --- a/modules/network/application-gateway-web-application-firewall-policies/README.md +++ b/modules/network/application-gateway-web-application-firewall-policy/README.md @@ -104,7 +104,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module applicationGatewayWebApplicationFirewallPolicies './network/application-gateway-web-application-firewall-policies/main.bicep' = { +module applicationGatewayWebApplicationFirewallPolicies './network/application-gateway-web-application-firewall-policy/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nagwafpcom' params: { // Required parameters diff --git a/modules/network/application-gateway-web-application-firewall-policies/main.bicep b/modules/network/application-gateway-web-application-firewall-policy/main.bicep similarity index 100% rename from modules/network/application-gateway-web-application-firewall-policies/main.bicep rename to modules/network/application-gateway-web-application-firewall-policy/main.bicep diff --git a/modules/network/application-gateway-web-application-firewall-policies/main.json b/modules/network/application-gateway-web-application-firewall-policy/main.json similarity index 100% rename from modules/network/application-gateway-web-application-firewall-policies/main.json rename to modules/network/application-gateway-web-application-firewall-policy/main.json diff --git a/modules/network/application-gateway-web-application-firewall-policies/version.json b/modules/network/application-gateway-web-application-firewall-policy/version.json similarity index 100% rename from modules/network/application-gateway-web-application-firewall-policies/version.json rename to modules/network/application-gateway-web-application-firewall-policy/version.json diff --git a/modules/network/application-gateways/.bicep/nested_roleAssignments.bicep b/modules/network/application-gateway/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/application-gateways/.bicep/nested_roleAssignments.bicep rename to modules/network/application-gateway/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/application-gateways/.test/common/dependencies.bicep b/modules/network/application-gateway/.test/common/dependencies.bicep similarity index 100% rename from modules/network/application-gateways/.test/common/dependencies.bicep rename to modules/network/application-gateway/.test/common/dependencies.bicep diff --git a/modules/network/application-gateways/.test/common/main.test.bicep b/modules/network/application-gateway/.test/common/main.test.bicep similarity index 100% rename from modules/network/application-gateways/.test/common/main.test.bicep rename to modules/network/application-gateway/.test/common/main.test.bicep diff --git a/modules/network/application-gateways/.test/main.test.bicep b/modules/network/application-gateway/.test/main.test.bicep similarity index 100% rename from modules/network/application-gateways/.test/main.test.bicep rename to modules/network/application-gateway/.test/main.test.bicep diff --git a/modules/network/application-gateways/README.md b/modules/network/application-gateway/README.md similarity index 99% rename from modules/network/application-gateways/README.md rename to modules/network/application-gateway/README.md index 2e52a59b0a..81a5406c18 100644 --- a/modules/network/application-gateways/README.md +++ b/modules/network/application-gateway/README.md @@ -244,7 +244,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module applicationGateways './network/application-gateways/main.bicep' = { +module applicationGateways './network/application-gateway/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nagcom' params: { // Required parameters diff --git a/modules/network/application-gateways/main.bicep b/modules/network/application-gateway/main.bicep similarity index 100% rename from modules/network/application-gateways/main.bicep rename to modules/network/application-gateway/main.bicep diff --git a/modules/network/application-gateways/main.json b/modules/network/application-gateway/main.json similarity index 100% rename from modules/network/application-gateways/main.json rename to modules/network/application-gateway/main.json diff --git a/modules/network/application-gateways/version.json b/modules/network/application-gateway/version.json similarity index 100% rename from modules/network/application-gateways/version.json rename to modules/network/application-gateway/version.json diff --git a/modules/network/application-security-groups/.bicep/nested_roleAssignments.bicep b/modules/network/application-security-group/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/application-security-groups/.bicep/nested_roleAssignments.bicep rename to modules/network/application-security-group/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/application-security-groups/.test/common/dependencies.bicep b/modules/network/application-security-group/.test/common/dependencies.bicep similarity index 100% rename from modules/network/application-security-groups/.test/common/dependencies.bicep rename to modules/network/application-security-group/.test/common/dependencies.bicep diff --git a/modules/network/application-security-groups/.test/common/main.test.bicep b/modules/network/application-security-group/.test/common/main.test.bicep similarity index 100% rename from modules/network/application-security-groups/.test/common/main.test.bicep rename to modules/network/application-security-group/.test/common/main.test.bicep diff --git a/modules/network/application-security-groups/.test/main.test.bicep b/modules/network/application-security-group/.test/main.test.bicep similarity index 100% rename from modules/network/application-security-groups/.test/main.test.bicep rename to modules/network/application-security-group/.test/main.test.bicep diff --git a/modules/network/application-security-groups/README.md b/modules/network/application-security-group/README.md similarity index 99% rename from modules/network/application-security-groups/README.md rename to modules/network/application-security-group/README.md index b55895e615..823514c993 100644 --- a/modules/network/application-security-groups/README.md +++ b/modules/network/application-security-group/README.md @@ -164,7 +164,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module applicationSecurityGroups './network/application-security-groups/main.bicep' = { +module applicationSecurityGroups './network/application-security-group/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nasgcom' params: { // Required parameters diff --git a/modules/network/application-security-groups/main.bicep b/modules/network/application-security-group/main.bicep similarity index 100% rename from modules/network/application-security-groups/main.bicep rename to modules/network/application-security-group/main.bicep diff --git a/modules/network/application-security-groups/main.json b/modules/network/application-security-group/main.json similarity index 100% rename from modules/network/application-security-groups/main.json rename to modules/network/application-security-group/main.json diff --git a/modules/network/application-security-groups/version.json b/modules/network/application-security-group/version.json similarity index 100% rename from modules/network/application-security-groups/version.json rename to modules/network/application-security-group/version.json diff --git a/modules/network/azure-firewalls/.bicep/nested_roleAssignments.bicep b/modules/network/azure-firewall/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/azure-firewalls/.bicep/nested_roleAssignments.bicep rename to modules/network/azure-firewall/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/azure-firewalls/.test/addpip/dependencies.bicep b/modules/network/azure-firewall/.test/addpip/dependencies.bicep similarity index 100% rename from modules/network/azure-firewalls/.test/addpip/dependencies.bicep rename to modules/network/azure-firewall/.test/addpip/dependencies.bicep diff --git a/modules/network/azure-firewalls/.test/addpip/main.test.bicep b/modules/network/azure-firewall/.test/addpip/main.test.bicep similarity index 100% rename from modules/network/azure-firewalls/.test/addpip/main.test.bicep rename to modules/network/azure-firewall/.test/addpip/main.test.bicep diff --git a/modules/network/azure-firewalls/.test/common/dependencies.bicep b/modules/network/azure-firewall/.test/common/dependencies.bicep similarity index 100% rename from modules/network/azure-firewalls/.test/common/dependencies.bicep rename to modules/network/azure-firewall/.test/common/dependencies.bicep diff --git a/modules/network/azure-firewalls/.test/common/main.test.bicep b/modules/network/azure-firewall/.test/common/main.test.bicep similarity index 100% rename from modules/network/azure-firewalls/.test/common/main.test.bicep rename to modules/network/azure-firewall/.test/common/main.test.bicep diff --git a/modules/network/azure-firewalls/.test/custompip/dependencies.bicep b/modules/network/azure-firewall/.test/custompip/dependencies.bicep similarity index 100% rename from modules/network/azure-firewalls/.test/custompip/dependencies.bicep rename to modules/network/azure-firewall/.test/custompip/dependencies.bicep diff --git a/modules/network/azure-firewalls/.test/custompip/main.test.bicep b/modules/network/azure-firewall/.test/custompip/main.test.bicep similarity index 100% rename from modules/network/azure-firewalls/.test/custompip/main.test.bicep rename to modules/network/azure-firewall/.test/custompip/main.test.bicep diff --git a/modules/network/azure-firewalls/.test/hubcommon/dependencies.bicep b/modules/network/azure-firewall/.test/hubcommon/dependencies.bicep similarity index 100% rename from modules/network/azure-firewalls/.test/hubcommon/dependencies.bicep rename to modules/network/azure-firewall/.test/hubcommon/dependencies.bicep diff --git a/modules/network/azure-firewalls/.test/hubcommon/main.test.bicep b/modules/network/azure-firewall/.test/hubcommon/main.test.bicep similarity index 100% rename from modules/network/azure-firewalls/.test/hubcommon/main.test.bicep rename to modules/network/azure-firewall/.test/hubcommon/main.test.bicep diff --git a/modules/network/azure-firewalls/.test/hubmin/dependencies.bicep b/modules/network/azure-firewall/.test/hubmin/dependencies.bicep similarity index 100% rename from modules/network/azure-firewalls/.test/hubmin/dependencies.bicep rename to modules/network/azure-firewall/.test/hubmin/dependencies.bicep diff --git a/modules/network/azure-firewalls/.test/hubmin/main.test.bicep b/modules/network/azure-firewall/.test/hubmin/main.test.bicep similarity index 100% rename from modules/network/azure-firewalls/.test/hubmin/main.test.bicep rename to modules/network/azure-firewall/.test/hubmin/main.test.bicep diff --git a/modules/network/azure-firewalls/.test/main.test.bicep b/modules/network/azure-firewall/.test/main.test.bicep similarity index 100% rename from modules/network/azure-firewalls/.test/main.test.bicep rename to modules/network/azure-firewall/.test/main.test.bicep diff --git a/modules/network/azure-firewalls/.test/min/dependencies.bicep b/modules/network/azure-firewall/.test/min/dependencies.bicep similarity index 100% rename from modules/network/azure-firewalls/.test/min/dependencies.bicep rename to modules/network/azure-firewall/.test/min/dependencies.bicep diff --git a/modules/network/azure-firewalls/.test/min/main.test.bicep b/modules/network/azure-firewall/.test/min/main.test.bicep similarity index 100% rename from modules/network/azure-firewalls/.test/min/main.test.bicep rename to modules/network/azure-firewall/.test/min/main.test.bicep diff --git a/modules/network/azure-firewalls/README.md b/modules/network/azure-firewall/README.md similarity index 98% rename from modules/network/azure-firewalls/README.md rename to modules/network/azure-firewall/README.md index 700b5351c1..715524ce61 100644 --- a/modules/network/azure-firewalls/README.md +++ b/modules/network/azure-firewall/README.md @@ -328,7 +328,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module azureFirewalls './network/azure-firewalls/main.bicep' = { +module azureFirewalls './network/azure-firewall/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nafaddpip' params: { // Required parameters @@ -401,7 +401,7 @@ module azureFirewalls './network/azure-firewalls/main.bicep' = { via Bicep module ```bicep -module azureFirewalls './network/azure-firewalls/main.bicep' = { +module azureFirewalls './network/azure-firewall/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nafcom' params: { // Required parameters @@ -686,7 +686,7 @@ module azureFirewalls './network/azure-firewalls/main.bicep' = { via Bicep module ```bicep -module azureFirewalls './network/azure-firewalls/main.bicep' = { +module azureFirewalls './network/azure-firewall/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nafcstpip' params: { // Required parameters @@ -795,7 +795,7 @@ module azureFirewalls './network/azure-firewalls/main.bicep' = { via Bicep module ```bicep -module azureFirewalls './network/azure-firewalls/main.bicep' = { +module azureFirewalls './network/azure-firewall/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nafhubcom' params: { // Required parameters @@ -870,7 +870,7 @@ module azureFirewalls './network/azure-firewalls/main.bicep' = { via Bicep module ```bicep -module azureFirewalls './network/azure-firewalls/main.bicep' = { +module azureFirewalls './network/azure-firewall/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nafhubmin' params: { // Required parameters @@ -931,7 +931,7 @@ module azureFirewalls './network/azure-firewalls/main.bicep' = { via Bicep module ```bicep -module azureFirewalls './network/azure-firewalls/main.bicep' = { +module azureFirewalls './network/azure-firewall/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nafmin' params: { // Required parameters diff --git a/modules/network/azure-firewalls/main.bicep b/modules/network/azure-firewall/main.bicep similarity index 98% rename from modules/network/azure-firewalls/main.bicep rename to modules/network/azure-firewall/main.bicep index 3d9e461439..cf8013a260 100644 --- a/modules/network/azure-firewalls/main.bicep +++ b/modules/network/azure-firewall/main.bicep @@ -208,7 +208,7 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (ena } // create a Public IP address if one is not provided and the flag is true -module publicIPAddress '../../network/public-ip-addresses/main.bicep' = if (empty(publicIPResourceID) && isCreateDefaultPublicIP && azureSkuName == 'AZFW_VNet') { +module publicIPAddress '../../network/public-ip-address/main.bicep' = if (empty(publicIPResourceID) && isCreateDefaultPublicIP && azureSkuName == 'AZFW_VNet') { name: '${uniqueString(deployment().name, location)}-Firewall-PIP' params: { name: contains(publicIPAddressObject, 'name') ? (!(empty(publicIPAddressObject.name)) ? publicIPAddressObject.name : '${name}-pip') : '${name}-pip' diff --git a/modules/network/azure-firewalls/main.json b/modules/network/azure-firewall/main.json similarity index 100% rename from modules/network/azure-firewalls/main.json rename to modules/network/azure-firewall/main.json diff --git a/modules/network/azure-firewalls/version.json b/modules/network/azure-firewall/version.json similarity index 100% rename from modules/network/azure-firewalls/version.json rename to modules/network/azure-firewall/version.json diff --git a/modules/network/bastion-hosts/.bicep/nested_roleAssignments.bicep b/modules/network/bastion-host/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/bastion-hosts/.bicep/nested_roleAssignments.bicep rename to modules/network/bastion-host/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/bastion-hosts/.test/common/dependencies.bicep b/modules/network/bastion-host/.test/common/dependencies.bicep similarity index 100% rename from modules/network/bastion-hosts/.test/common/dependencies.bicep rename to modules/network/bastion-host/.test/common/dependencies.bicep diff --git a/modules/network/bastion-hosts/.test/common/main.test.bicep b/modules/network/bastion-host/.test/common/main.test.bicep similarity index 100% rename from modules/network/bastion-hosts/.test/common/main.test.bicep rename to modules/network/bastion-host/.test/common/main.test.bicep diff --git a/modules/network/bastion-hosts/.test/custompip/dependencies.bicep b/modules/network/bastion-host/.test/custompip/dependencies.bicep similarity index 100% rename from modules/network/bastion-hosts/.test/custompip/dependencies.bicep rename to modules/network/bastion-host/.test/custompip/dependencies.bicep diff --git a/modules/network/bastion-hosts/.test/custompip/main.test.bicep b/modules/network/bastion-host/.test/custompip/main.test.bicep similarity index 100% rename from modules/network/bastion-hosts/.test/custompip/main.test.bicep rename to modules/network/bastion-host/.test/custompip/main.test.bicep diff --git a/modules/network/bastion-hosts/.test/main.test.bicep b/modules/network/bastion-host/.test/main.test.bicep similarity index 100% rename from modules/network/bastion-hosts/.test/main.test.bicep rename to modules/network/bastion-host/.test/main.test.bicep diff --git a/modules/network/bastion-hosts/.test/min/dependencies.bicep b/modules/network/bastion-host/.test/min/dependencies.bicep similarity index 100% rename from modules/network/bastion-hosts/.test/min/dependencies.bicep rename to modules/network/bastion-host/.test/min/dependencies.bicep diff --git a/modules/network/bastion-hosts/.test/min/main.test.bicep b/modules/network/bastion-host/.test/min/main.test.bicep similarity index 100% rename from modules/network/bastion-hosts/.test/min/main.test.bicep rename to modules/network/bastion-host/.test/min/main.test.bicep diff --git a/modules/network/bastion-hosts/README.md b/modules/network/bastion-host/README.md similarity index 98% rename from modules/network/bastion-hosts/README.md rename to modules/network/bastion-host/README.md index 423cb5db6a..e0e83c52c9 100644 --- a/modules/network/bastion-hosts/README.md +++ b/modules/network/bastion-host/README.md @@ -310,7 +310,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module bastionHosts './network/bastion-hosts/main.bicep' = { +module bastionHosts './network/bastion-host/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nbhcom' params: { // Required parameters @@ -441,7 +441,7 @@ module bastionHosts './network/bastion-hosts/main.bicep' = { via Bicep module ```bicep -module bastionHosts './network/bastion-hosts/main.bicep' = { +module bastionHosts './network/bastion-host/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nbhctmpip' params: { // Required parameters @@ -550,7 +550,7 @@ module bastionHosts './network/bastion-hosts/main.bicep' = { via Bicep module ```bicep -module bastionHosts './network/bastion-hosts/main.bicep' = { +module bastionHosts './network/bastion-host/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nbhmin' params: { // Required parameters diff --git a/modules/network/bastion-hosts/main.bicep b/modules/network/bastion-host/main.bicep similarity index 98% rename from modules/network/bastion-hosts/main.bicep rename to modules/network/bastion-host/main.bicep index 9a380dd292..797177e37e 100644 --- a/modules/network/bastion-hosts/main.bicep +++ b/modules/network/bastion-host/main.bicep @@ -161,7 +161,7 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2022-09-01' = if (ena } } -module publicIPAddress '../public-ip-addresses/main.bicep' = if (empty(bastionSubnetPublicIpResourceId) && isCreateDefaultPublicIP) { +module publicIPAddress '../public-ip-address/main.bicep' = if (empty(bastionSubnetPublicIpResourceId) && isCreateDefaultPublicIP) { name: '${uniqueString(deployment().name, location)}-Bastion-PIP' params: { name: contains(publicIPAddressObject, 'name') ? publicIPAddressObject.name : '${name}-pip' diff --git a/modules/network/bastion-hosts/main.json b/modules/network/bastion-host/main.json similarity index 100% rename from modules/network/bastion-hosts/main.json rename to modules/network/bastion-host/main.json diff --git a/modules/network/bastion-hosts/version.json b/modules/network/bastion-host/version.json similarity index 100% rename from modules/network/bastion-hosts/version.json rename to modules/network/bastion-host/version.json diff --git a/modules/network/connections/.test/main.test.bicep b/modules/network/connection/.test/main.test.bicep similarity index 100% rename from modules/network/connections/.test/main.test.bicep rename to modules/network/connection/.test/main.test.bicep diff --git a/modules/network/connections/.test/vnet2vnet/dependencies.bicep b/modules/network/connection/.test/vnet2vnet/dependencies.bicep similarity index 100% rename from modules/network/connections/.test/vnet2vnet/dependencies.bicep rename to modules/network/connection/.test/vnet2vnet/dependencies.bicep diff --git a/modules/network/connections/.test/vnet2vnet/main.test.bicep b/modules/network/connection/.test/vnet2vnet/main.test.bicep similarity index 100% rename from modules/network/connections/.test/vnet2vnet/main.test.bicep rename to modules/network/connection/.test/vnet2vnet/main.test.bicep diff --git a/modules/network/connections/README.md b/modules/network/connection/README.md similarity index 99% rename from modules/network/connections/README.md rename to modules/network/connection/README.md index 95a9cf570c..a02b79e33c 100644 --- a/modules/network/connections/README.md +++ b/modules/network/connection/README.md @@ -330,7 +330,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module connections './network/connections/main.bicep' = { +module connections './network/connection/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ncvtv' params: { // Required parameters diff --git a/modules/network/connections/main.bicep b/modules/network/connection/main.bicep similarity index 100% rename from modules/network/connections/main.bicep rename to modules/network/connection/main.bicep diff --git a/modules/network/connections/main.json b/modules/network/connection/main.json similarity index 100% rename from modules/network/connections/main.json rename to modules/network/connection/main.json diff --git a/modules/network/connections/version.json b/modules/network/connection/version.json similarity index 100% rename from modules/network/connections/version.json rename to modules/network/connection/version.json diff --git a/modules/network/ddos-protection-plans/.bicep/nested_roleAssignments.bicep b/modules/network/ddos-protection-plan/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/ddos-protection-plans/.bicep/nested_roleAssignments.bicep rename to modules/network/ddos-protection-plan/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/ddos-protection-plans/.test/common/dependencies.bicep b/modules/network/ddos-protection-plan/.test/common/dependencies.bicep similarity index 100% rename from modules/network/ddos-protection-plans/.test/common/dependencies.bicep rename to modules/network/ddos-protection-plan/.test/common/dependencies.bicep diff --git a/modules/network/ddos-protection-plans/.test/common/main.test.bicep b/modules/network/ddos-protection-plan/.test/common/main.test.bicep similarity index 100% rename from modules/network/ddos-protection-plans/.test/common/main.test.bicep rename to modules/network/ddos-protection-plan/.test/common/main.test.bicep diff --git a/modules/network/ddos-protection-plans/.test/main.test.bicep b/modules/network/ddos-protection-plan/.test/main.test.bicep similarity index 100% rename from modules/network/ddos-protection-plans/.test/main.test.bicep rename to modules/network/ddos-protection-plan/.test/main.test.bicep diff --git a/modules/network/ddos-protection-plans/.test/min/main.test.bicep b/modules/network/ddos-protection-plan/.test/min/main.test.bicep similarity index 100% rename from modules/network/ddos-protection-plans/.test/min/main.test.bicep rename to modules/network/ddos-protection-plan/.test/min/main.test.bicep diff --git a/modules/network/ddos-protection-plans/README.md b/modules/network/ddos-protection-plan/README.md similarity index 97% rename from modules/network/ddos-protection-plans/README.md rename to modules/network/ddos-protection-plan/README.md index dc8d6c9d71..652920b8bf 100644 --- a/modules/network/ddos-protection-plans/README.md +++ b/modules/network/ddos-protection-plan/README.md @@ -164,7 +164,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module ddosProtectionPlans './network/ddos-protection-plans/main.bicep' = { +module ddosProtectionPlans './network/ddos-protection-plan/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ndppcom' params: { // Required parameters @@ -243,7 +243,7 @@ module ddosProtectionPlans './network/ddos-protection-plans/main.bicep' = { via Bicep module ```bicep -module ddosProtectionPlans './network/ddos-protection-plans/main.bicep' = { +module ddosProtectionPlans './network/ddos-protection-plan/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ndppmin' params: { // Required parameters diff --git a/modules/network/ddos-protection-plans/main.bicep b/modules/network/ddos-protection-plan/main.bicep similarity index 100% rename from modules/network/ddos-protection-plans/main.bicep rename to modules/network/ddos-protection-plan/main.bicep diff --git a/modules/network/ddos-protection-plans/main.json b/modules/network/ddos-protection-plan/main.json similarity index 100% rename from modules/network/ddos-protection-plans/main.json rename to modules/network/ddos-protection-plan/main.json diff --git a/modules/network/ddos-protection-plans/version.json b/modules/network/ddos-protection-plan/version.json similarity index 100% rename from modules/network/ddos-protection-plans/version.json rename to modules/network/ddos-protection-plan/version.json diff --git a/modules/network/dns-forwarding-rulesets/.bicep/nested_roleAssignments.bicep b/modules/network/dns-forwarding-ruleset/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/dns-forwarding-rulesets/.bicep/nested_roleAssignments.bicep rename to modules/network/dns-forwarding-ruleset/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/dns-forwarding-rulesets/.test/common/dependencies.bicep b/modules/network/dns-forwarding-ruleset/.test/common/dependencies.bicep similarity index 100% rename from modules/network/dns-forwarding-rulesets/.test/common/dependencies.bicep rename to modules/network/dns-forwarding-ruleset/.test/common/dependencies.bicep diff --git a/modules/network/dns-forwarding-rulesets/.test/common/main.test.bicep b/modules/network/dns-forwarding-ruleset/.test/common/main.test.bicep similarity index 100% rename from modules/network/dns-forwarding-rulesets/.test/common/main.test.bicep rename to modules/network/dns-forwarding-ruleset/.test/common/main.test.bicep diff --git a/modules/network/dns-forwarding-rulesets/.test/main.test.bicep b/modules/network/dns-forwarding-ruleset/.test/main.test.bicep similarity index 100% rename from modules/network/dns-forwarding-rulesets/.test/main.test.bicep rename to modules/network/dns-forwarding-ruleset/.test/main.test.bicep diff --git a/modules/network/dns-forwarding-rulesets/.test/min/dependencies.bicep b/modules/network/dns-forwarding-ruleset/.test/min/dependencies.bicep similarity index 100% rename from modules/network/dns-forwarding-rulesets/.test/min/dependencies.bicep rename to modules/network/dns-forwarding-ruleset/.test/min/dependencies.bicep diff --git a/modules/network/dns-forwarding-rulesets/.test/min/main.test.bicep b/modules/network/dns-forwarding-ruleset/.test/min/main.test.bicep similarity index 100% rename from modules/network/dns-forwarding-rulesets/.test/min/main.test.bicep rename to modules/network/dns-forwarding-ruleset/.test/min/main.test.bicep diff --git a/modules/network/dns-forwarding-rulesets/README.md b/modules/network/dns-forwarding-ruleset/README.md similarity index 98% rename from modules/network/dns-forwarding-rulesets/README.md rename to modules/network/dns-forwarding-ruleset/README.md index 28ff5533db..7f13828b7b 100644 --- a/modules/network/dns-forwarding-rulesets/README.md +++ b/modules/network/dns-forwarding-ruleset/README.md @@ -169,7 +169,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module dnsForwardingRulesets './network/dns-forwarding-rulesets/main.bicep' = { +module dnsForwardingRulesets './network/dns-forwarding-ruleset/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ndfrscom' params: { // Required parameters @@ -292,7 +292,7 @@ module dnsForwardingRulesets './network/dns-forwarding-rulesets/main.bicep' = { via Bicep module ```bicep -module dnsForwardingRulesets './network/dns-forwarding-rulesets/main.bicep' = { +module dnsForwardingRulesets './network/dns-forwarding-ruleset/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ndfrsmin' params: { // Required parameters diff --git a/modules/network/dns-forwarding-rulesets/forwarding-rules/README.md b/modules/network/dns-forwarding-ruleset/forwarding-rules/README.md similarity index 100% rename from modules/network/dns-forwarding-rulesets/forwarding-rules/README.md rename to modules/network/dns-forwarding-ruleset/forwarding-rules/README.md diff --git a/modules/network/dns-forwarding-rulesets/forwarding-rules/main.bicep b/modules/network/dns-forwarding-ruleset/forwarding-rules/main.bicep similarity index 100% rename from modules/network/dns-forwarding-rulesets/forwarding-rules/main.bicep rename to modules/network/dns-forwarding-ruleset/forwarding-rules/main.bicep diff --git a/modules/network/dns-forwarding-rulesets/forwarding-rules/main.json b/modules/network/dns-forwarding-ruleset/forwarding-rules/main.json similarity index 100% rename from modules/network/dns-forwarding-rulesets/forwarding-rules/main.json rename to modules/network/dns-forwarding-ruleset/forwarding-rules/main.json diff --git a/modules/network/dns-forwarding-rulesets/forwarding-rules/version.json b/modules/network/dns-forwarding-ruleset/forwarding-rules/version.json similarity index 100% rename from modules/network/dns-forwarding-rulesets/forwarding-rules/version.json rename to modules/network/dns-forwarding-ruleset/forwarding-rules/version.json diff --git a/modules/network/dns-forwarding-rulesets/main.bicep b/modules/network/dns-forwarding-ruleset/main.bicep similarity index 96% rename from modules/network/dns-forwarding-rulesets/main.bicep rename to modules/network/dns-forwarding-ruleset/main.bicep index bbe4d748a8..205acc5938 100644 --- a/modules/network/dns-forwarding-rulesets/main.bicep +++ b/modules/network/dns-forwarding-ruleset/main.bicep @@ -58,7 +58,7 @@ resource dnsForwardingRuleset 'Microsoft.Network/dnsForwardingRulesets@2022-07-0 } } -module dnsForwardingRuleset_forwardingRule 'forwarding-rules/main.bicep' = [for (forwardingRule, index) in forwardingRules: { +module dnsForwardingRuleset_forwardingRule 'forwarding-rule/main.bicep' = [for (forwardingRule, index) in forwardingRules: { name: '${uniqueString(deployment().name, location)}-forwardingRule-${index}' params: { dnsForwardingRulesetName: dnsForwardingRuleset.name @@ -69,7 +69,7 @@ module dnsForwardingRuleset_forwardingRule 'forwarding-rules/main.bicep' = [for } }] -module dnsForwardingRuleset_virtualNetworkLinks 'virtual-network-links/main.bicep' = [for (vnetId, index) in vNetLinks: { +module dnsForwardingRuleset_virtualNetworkLinks 'virtual-network-link/main.bicep' = [for (vnetId, index) in vNetLinks: { name: '${uniqueString(deployment().name, location)}-virtualNetworkLink-${index}' params: { dnsForwardingRulesetName: dnsForwardingRuleset.name diff --git a/modules/network/dns-forwarding-rulesets/main.json b/modules/network/dns-forwarding-ruleset/main.json similarity index 100% rename from modules/network/dns-forwarding-rulesets/main.json rename to modules/network/dns-forwarding-ruleset/main.json diff --git a/modules/network/dns-forwarding-rulesets/version.json b/modules/network/dns-forwarding-ruleset/version.json similarity index 100% rename from modules/network/dns-forwarding-rulesets/version.json rename to modules/network/dns-forwarding-ruleset/version.json diff --git a/modules/network/dns-forwarding-rulesets/virtual-network-links/README.md b/modules/network/dns-forwarding-ruleset/virtual-network-links/README.md similarity index 100% rename from modules/network/dns-forwarding-rulesets/virtual-network-links/README.md rename to modules/network/dns-forwarding-ruleset/virtual-network-links/README.md diff --git a/modules/network/dns-forwarding-rulesets/virtual-network-links/main.bicep b/modules/network/dns-forwarding-ruleset/virtual-network-links/main.bicep similarity index 100% rename from modules/network/dns-forwarding-rulesets/virtual-network-links/main.bicep rename to modules/network/dns-forwarding-ruleset/virtual-network-links/main.bicep diff --git a/modules/network/dns-forwarding-rulesets/virtual-network-links/main.json b/modules/network/dns-forwarding-ruleset/virtual-network-links/main.json similarity index 100% rename from modules/network/dns-forwarding-rulesets/virtual-network-links/main.json rename to modules/network/dns-forwarding-ruleset/virtual-network-links/main.json diff --git a/modules/network/dns-forwarding-rulesets/virtual-network-links/version.json b/modules/network/dns-forwarding-ruleset/virtual-network-links/version.json similarity index 100% rename from modules/network/dns-forwarding-rulesets/virtual-network-links/version.json rename to modules/network/dns-forwarding-ruleset/virtual-network-links/version.json diff --git a/modules/network/dns-resolvers/.bicep/nested_roleAssignments.bicep b/modules/network/dns-resolver/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/dns-resolvers/.bicep/nested_roleAssignments.bicep rename to modules/network/dns-resolver/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/dns-resolvers/.test/common/dependencies.bicep b/modules/network/dns-resolver/.test/common/dependencies.bicep similarity index 100% rename from modules/network/dns-resolvers/.test/common/dependencies.bicep rename to modules/network/dns-resolver/.test/common/dependencies.bicep diff --git a/modules/network/dns-resolvers/.test/common/main.test.bicep b/modules/network/dns-resolver/.test/common/main.test.bicep similarity index 100% rename from modules/network/dns-resolvers/.test/common/main.test.bicep rename to modules/network/dns-resolver/.test/common/main.test.bicep diff --git a/modules/network/dns-resolvers/.test/main.test.bicep b/modules/network/dns-resolver/.test/main.test.bicep similarity index 100% rename from modules/network/dns-resolvers/.test/main.test.bicep rename to modules/network/dns-resolver/.test/main.test.bicep diff --git a/modules/network/dns-resolvers/README.md b/modules/network/dns-resolver/README.md similarity index 99% rename from modules/network/dns-resolvers/README.md rename to modules/network/dns-resolver/README.md index b2cd4d876d..450ddbc1fa 100644 --- a/modules/network/dns-resolvers/README.md +++ b/modules/network/dns-resolver/README.md @@ -251,7 +251,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module dnsResolvers './network/dns-resolvers/main.bicep' = { +module dnsResolvers './network/dns-resolver/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ndrcom' params: { // Required parameters diff --git a/modules/network/dns-resolvers/main.bicep b/modules/network/dns-resolver/main.bicep similarity index 100% rename from modules/network/dns-resolvers/main.bicep rename to modules/network/dns-resolver/main.bicep diff --git a/modules/network/dns-resolvers/main.json b/modules/network/dns-resolver/main.json similarity index 100% rename from modules/network/dns-resolvers/main.json rename to modules/network/dns-resolver/main.json diff --git a/modules/network/dns-resolvers/version.json b/modules/network/dns-resolver/version.json similarity index 100% rename from modules/network/dns-resolvers/version.json rename to modules/network/dns-resolver/version.json diff --git a/modules/network/dns-zones/.bicep/nested_roleAssignments.bicep b/modules/network/dns-zone/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/dns-zones/.bicep/nested_roleAssignments.bicep rename to modules/network/dns-zone/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/dns-zones/.test/common/dependencies.bicep b/modules/network/dns-zone/.test/common/dependencies.bicep similarity index 100% rename from modules/network/dns-zones/.test/common/dependencies.bicep rename to modules/network/dns-zone/.test/common/dependencies.bicep diff --git a/modules/network/dns-zones/.test/common/main.test.bicep b/modules/network/dns-zone/.test/common/main.test.bicep similarity index 100% rename from modules/network/dns-zones/.test/common/main.test.bicep rename to modules/network/dns-zone/.test/common/main.test.bicep diff --git a/modules/network/dns-zones/.test/main.test.bicep b/modules/network/dns-zone/.test/main.test.bicep similarity index 100% rename from modules/network/dns-zones/.test/main.test.bicep rename to modules/network/dns-zone/.test/main.test.bicep diff --git a/modules/network/dns-zones/.test/min/main.test.bicep b/modules/network/dns-zone/.test/min/main.test.bicep similarity index 100% rename from modules/network/dns-zones/.test/min/main.test.bicep rename to modules/network/dns-zone/.test/min/main.test.bicep diff --git a/modules/network/dns-zones/README.md b/modules/network/dns-zone/README.md similarity index 99% rename from modules/network/dns-zones/README.md rename to modules/network/dns-zone/README.md index 82da35a57a..36a29d0b3a 100644 --- a/modules/network/dns-zones/README.md +++ b/modules/network/dns-zone/README.md @@ -184,7 +184,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module dnsZones './network/dns-zones/main.bicep' = { +module dnsZones './network/dns-zone/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ndzcom' params: { // Required parameters @@ -605,7 +605,7 @@ module dnsZones './network/dns-zones/main.bicep' = { via Bicep module ```bicep -module dnsZones './network/dns-zones/main.bicep' = { +module dnsZones './network/dns-zone/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ndzmin' params: { // Required parameters diff --git a/modules/network/dns-zones/a/.bicep/nested_roleAssignments.bicep b/modules/network/dns-zone/a/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/dns-zones/a/.bicep/nested_roleAssignments.bicep rename to modules/network/dns-zone/a/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/dns-zones/a/README.md b/modules/network/dns-zone/a/README.md similarity index 100% rename from modules/network/dns-zones/a/README.md rename to modules/network/dns-zone/a/README.md diff --git a/modules/network/dns-zones/a/main.bicep b/modules/network/dns-zone/a/main.bicep similarity index 100% rename from modules/network/dns-zones/a/main.bicep rename to modules/network/dns-zone/a/main.bicep diff --git a/modules/network/dns-zones/a/main.json b/modules/network/dns-zone/a/main.json similarity index 100% rename from modules/network/dns-zones/a/main.json rename to modules/network/dns-zone/a/main.json diff --git a/modules/network/dns-zones/a/version.json b/modules/network/dns-zone/a/version.json similarity index 100% rename from modules/network/dns-zones/a/version.json rename to modules/network/dns-zone/a/version.json diff --git a/modules/network/dns-zones/aaaa/.bicep/nested_roleAssignments.bicep b/modules/network/dns-zone/aaaa/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/dns-zones/aaaa/.bicep/nested_roleAssignments.bicep rename to modules/network/dns-zone/aaaa/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/dns-zones/aaaa/README.md b/modules/network/dns-zone/aaaa/README.md similarity index 100% rename from modules/network/dns-zones/aaaa/README.md rename to modules/network/dns-zone/aaaa/README.md diff --git a/modules/network/dns-zones/aaaa/main.bicep b/modules/network/dns-zone/aaaa/main.bicep similarity index 100% rename from modules/network/dns-zones/aaaa/main.bicep rename to modules/network/dns-zone/aaaa/main.bicep diff --git a/modules/network/dns-zones/aaaa/main.json b/modules/network/dns-zone/aaaa/main.json similarity index 100% rename from modules/network/dns-zones/aaaa/main.json rename to modules/network/dns-zone/aaaa/main.json diff --git a/modules/network/dns-zones/aaaa/version.json b/modules/network/dns-zone/aaaa/version.json similarity index 100% rename from modules/network/dns-zones/aaaa/version.json rename to modules/network/dns-zone/aaaa/version.json diff --git a/modules/network/dns-zones/caa/.bicep/nested_roleAssignments.bicep b/modules/network/dns-zone/caa/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/dns-zones/caa/.bicep/nested_roleAssignments.bicep rename to modules/network/dns-zone/caa/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/dns-zones/caa/README.md b/modules/network/dns-zone/caa/README.md similarity index 100% rename from modules/network/dns-zones/caa/README.md rename to modules/network/dns-zone/caa/README.md diff --git a/modules/network/dns-zones/caa/main.bicep b/modules/network/dns-zone/caa/main.bicep similarity index 100% rename from modules/network/dns-zones/caa/main.bicep rename to modules/network/dns-zone/caa/main.bicep diff --git a/modules/network/dns-zones/caa/main.json b/modules/network/dns-zone/caa/main.json similarity index 100% rename from modules/network/dns-zones/caa/main.json rename to modules/network/dns-zone/caa/main.json diff --git a/modules/network/dns-zones/caa/version.json b/modules/network/dns-zone/caa/version.json similarity index 100% rename from modules/network/dns-zones/caa/version.json rename to modules/network/dns-zone/caa/version.json diff --git a/modules/network/dns-zones/cname/.bicep/nested_roleAssignments.bicep b/modules/network/dns-zone/cname/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/dns-zones/cname/.bicep/nested_roleAssignments.bicep rename to modules/network/dns-zone/cname/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/dns-zones/cname/README.md b/modules/network/dns-zone/cname/README.md similarity index 100% rename from modules/network/dns-zones/cname/README.md rename to modules/network/dns-zone/cname/README.md diff --git a/modules/network/dns-zones/cname/main.bicep b/modules/network/dns-zone/cname/main.bicep similarity index 100% rename from modules/network/dns-zones/cname/main.bicep rename to modules/network/dns-zone/cname/main.bicep diff --git a/modules/network/dns-zones/cname/main.json b/modules/network/dns-zone/cname/main.json similarity index 100% rename from modules/network/dns-zones/cname/main.json rename to modules/network/dns-zone/cname/main.json diff --git a/modules/network/dns-zones/cname/version.json b/modules/network/dns-zone/cname/version.json similarity index 100% rename from modules/network/dns-zones/cname/version.json rename to modules/network/dns-zone/cname/version.json diff --git a/modules/network/dns-zones/main.bicep b/modules/network/dns-zone/main.bicep similarity index 100% rename from modules/network/dns-zones/main.bicep rename to modules/network/dns-zone/main.bicep diff --git a/modules/network/dns-zones/main.json b/modules/network/dns-zone/main.json similarity index 100% rename from modules/network/dns-zones/main.json rename to modules/network/dns-zone/main.json diff --git a/modules/network/dns-zones/mx/.bicep/nested_roleAssignments.bicep b/modules/network/dns-zone/mx/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/dns-zones/mx/.bicep/nested_roleAssignments.bicep rename to modules/network/dns-zone/mx/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/dns-zones/mx/README.md b/modules/network/dns-zone/mx/README.md similarity index 100% rename from modules/network/dns-zones/mx/README.md rename to modules/network/dns-zone/mx/README.md diff --git a/modules/network/dns-zones/mx/main.bicep b/modules/network/dns-zone/mx/main.bicep similarity index 100% rename from modules/network/dns-zones/mx/main.bicep rename to modules/network/dns-zone/mx/main.bicep diff --git a/modules/network/dns-zones/mx/main.json b/modules/network/dns-zone/mx/main.json similarity index 100% rename from modules/network/dns-zones/mx/main.json rename to modules/network/dns-zone/mx/main.json diff --git a/modules/network/dns-zones/mx/version.json b/modules/network/dns-zone/mx/version.json similarity index 100% rename from modules/network/dns-zones/mx/version.json rename to modules/network/dns-zone/mx/version.json diff --git a/modules/network/dns-zones/ns/.bicep/nested_roleAssignments.bicep b/modules/network/dns-zone/ns/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/dns-zones/ns/.bicep/nested_roleAssignments.bicep rename to modules/network/dns-zone/ns/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/dns-zones/ns/README.md b/modules/network/dns-zone/ns/README.md similarity index 100% rename from modules/network/dns-zones/ns/README.md rename to modules/network/dns-zone/ns/README.md diff --git a/modules/network/dns-zones/ns/main.bicep b/modules/network/dns-zone/ns/main.bicep similarity index 100% rename from modules/network/dns-zones/ns/main.bicep rename to modules/network/dns-zone/ns/main.bicep diff --git a/modules/network/dns-zones/ns/main.json b/modules/network/dns-zone/ns/main.json similarity index 100% rename from modules/network/dns-zones/ns/main.json rename to modules/network/dns-zone/ns/main.json diff --git a/modules/network/dns-zones/ns/version.json b/modules/network/dns-zone/ns/version.json similarity index 100% rename from modules/network/dns-zones/ns/version.json rename to modules/network/dns-zone/ns/version.json diff --git a/modules/network/dns-zones/ptr/.bicep/nested_roleAssignments.bicep b/modules/network/dns-zone/ptr/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/dns-zones/ptr/.bicep/nested_roleAssignments.bicep rename to modules/network/dns-zone/ptr/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/dns-zones/ptr/README.md b/modules/network/dns-zone/ptr/README.md similarity index 100% rename from modules/network/dns-zones/ptr/README.md rename to modules/network/dns-zone/ptr/README.md diff --git a/modules/network/dns-zones/ptr/main.bicep b/modules/network/dns-zone/ptr/main.bicep similarity index 100% rename from modules/network/dns-zones/ptr/main.bicep rename to modules/network/dns-zone/ptr/main.bicep diff --git a/modules/network/dns-zones/ptr/main.json b/modules/network/dns-zone/ptr/main.json similarity index 100% rename from modules/network/dns-zones/ptr/main.json rename to modules/network/dns-zone/ptr/main.json diff --git a/modules/network/dns-zones/ptr/version.json b/modules/network/dns-zone/ptr/version.json similarity index 100% rename from modules/network/dns-zones/ptr/version.json rename to modules/network/dns-zone/ptr/version.json diff --git a/modules/network/dns-zones/soa/.bicep/nested_roleAssignments.bicep b/modules/network/dns-zone/soa/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/dns-zones/soa/.bicep/nested_roleAssignments.bicep rename to modules/network/dns-zone/soa/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/dns-zones/soa/README.md b/modules/network/dns-zone/soa/README.md similarity index 100% rename from modules/network/dns-zones/soa/README.md rename to modules/network/dns-zone/soa/README.md diff --git a/modules/network/dns-zones/soa/main.bicep b/modules/network/dns-zone/soa/main.bicep similarity index 100% rename from modules/network/dns-zones/soa/main.bicep rename to modules/network/dns-zone/soa/main.bicep diff --git a/modules/network/dns-zones/soa/main.json b/modules/network/dns-zone/soa/main.json similarity index 100% rename from modules/network/dns-zones/soa/main.json rename to modules/network/dns-zone/soa/main.json diff --git a/modules/network/dns-zones/soa/version.json b/modules/network/dns-zone/soa/version.json similarity index 100% rename from modules/network/dns-zones/soa/version.json rename to modules/network/dns-zone/soa/version.json diff --git a/modules/network/dns-zones/srv/.bicep/nested_roleAssignments.bicep b/modules/network/dns-zone/srv/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/dns-zones/srv/.bicep/nested_roleAssignments.bicep rename to modules/network/dns-zone/srv/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/dns-zones/srv/README.md b/modules/network/dns-zone/srv/README.md similarity index 100% rename from modules/network/dns-zones/srv/README.md rename to modules/network/dns-zone/srv/README.md diff --git a/modules/network/dns-zones/srv/main.bicep b/modules/network/dns-zone/srv/main.bicep similarity index 100% rename from modules/network/dns-zones/srv/main.bicep rename to modules/network/dns-zone/srv/main.bicep diff --git a/modules/network/dns-zones/srv/main.json b/modules/network/dns-zone/srv/main.json similarity index 100% rename from modules/network/dns-zones/srv/main.json rename to modules/network/dns-zone/srv/main.json diff --git a/modules/network/dns-zones/srv/version.json b/modules/network/dns-zone/srv/version.json similarity index 100% rename from modules/network/dns-zones/srv/version.json rename to modules/network/dns-zone/srv/version.json diff --git a/modules/network/dns-zones/txt/.bicep/nested_roleAssignments.bicep b/modules/network/dns-zone/txt/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/dns-zones/txt/.bicep/nested_roleAssignments.bicep rename to modules/network/dns-zone/txt/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/dns-zones/txt/README.md b/modules/network/dns-zone/txt/README.md similarity index 100% rename from modules/network/dns-zones/txt/README.md rename to modules/network/dns-zone/txt/README.md diff --git a/modules/network/dns-zones/txt/main.bicep b/modules/network/dns-zone/txt/main.bicep similarity index 100% rename from modules/network/dns-zones/txt/main.bicep rename to modules/network/dns-zone/txt/main.bicep diff --git a/modules/network/dns-zones/txt/main.json b/modules/network/dns-zone/txt/main.json similarity index 100% rename from modules/network/dns-zones/txt/main.json rename to modules/network/dns-zone/txt/main.json diff --git a/modules/network/dns-zones/txt/version.json b/modules/network/dns-zone/txt/version.json similarity index 100% rename from modules/network/dns-zones/txt/version.json rename to modules/network/dns-zone/txt/version.json diff --git a/modules/network/dns-zones/version.json b/modules/network/dns-zone/version.json similarity index 100% rename from modules/network/dns-zones/version.json rename to modules/network/dns-zone/version.json diff --git a/modules/network/express-route-circuits/.bicep/nested_roleAssignments.bicep b/modules/network/express-route-circuit/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/express-route-circuits/.bicep/nested_roleAssignments.bicep rename to modules/network/express-route-circuit/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/express-route-circuits/.test/common/dependencies.bicep b/modules/network/express-route-circuit/.test/common/dependencies.bicep similarity index 100% rename from modules/network/express-route-circuits/.test/common/dependencies.bicep rename to modules/network/express-route-circuit/.test/common/dependencies.bicep diff --git a/modules/network/express-route-circuits/.test/common/main.test.bicep b/modules/network/express-route-circuit/.test/common/main.test.bicep similarity index 100% rename from modules/network/express-route-circuits/.test/common/main.test.bicep rename to modules/network/express-route-circuit/.test/common/main.test.bicep diff --git a/modules/network/express-route-circuits/.test/main.test.bicep b/modules/network/express-route-circuit/.test/main.test.bicep similarity index 100% rename from modules/network/express-route-circuits/.test/main.test.bicep rename to modules/network/express-route-circuit/.test/main.test.bicep diff --git a/modules/network/express-route-circuits/.test/min/main.test.bicep b/modules/network/express-route-circuit/.test/min/main.test.bicep similarity index 100% rename from modules/network/express-route-circuits/.test/min/main.test.bicep rename to modules/network/express-route-circuit/.test/min/main.test.bicep diff --git a/modules/network/express-route-circuits/README.md b/modules/network/express-route-circuit/README.md similarity index 98% rename from modules/network/express-route-circuits/README.md rename to modules/network/express-route-circuit/README.md index 1dd491b6f9..0ae02c190f 100644 --- a/modules/network/express-route-circuits/README.md +++ b/modules/network/express-route-circuit/README.md @@ -190,7 +190,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module expressRouteCircuits './network/express-route-circuits/main.bicep' = { +module expressRouteCircuits './network/express-route-circuit/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nerccom' params: { // Required parameters @@ -313,7 +313,7 @@ module expressRouteCircuits './network/express-route-circuits/main.bicep' = { via Bicep module ```bicep -module expressRouteCircuits './network/express-route-circuits/main.bicep' = { +module expressRouteCircuits './network/express-route-circuit/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nercmin' params: { // Required parameters diff --git a/modules/network/express-route-circuits/main.bicep b/modules/network/express-route-circuit/main.bicep similarity index 100% rename from modules/network/express-route-circuits/main.bicep rename to modules/network/express-route-circuit/main.bicep diff --git a/modules/network/express-route-circuits/main.json b/modules/network/express-route-circuit/main.json similarity index 100% rename from modules/network/express-route-circuits/main.json rename to modules/network/express-route-circuit/main.json diff --git a/modules/network/express-route-circuits/version.json b/modules/network/express-route-circuit/version.json similarity index 100% rename from modules/network/express-route-circuits/version.json rename to modules/network/express-route-circuit/version.json diff --git a/modules/network/firewall-policies/.test/common/main.test.bicep b/modules/network/firewall-policy/.test/common/main.test.bicep similarity index 100% rename from modules/network/firewall-policies/.test/common/main.test.bicep rename to modules/network/firewall-policy/.test/common/main.test.bicep diff --git a/modules/network/firewall-policies/.test/main.test.bicep b/modules/network/firewall-policy/.test/main.test.bicep similarity index 100% rename from modules/network/firewall-policies/.test/main.test.bicep rename to modules/network/firewall-policy/.test/main.test.bicep diff --git a/modules/network/firewall-policies/.test/min/main.test.bicep b/modules/network/firewall-policy/.test/min/main.test.bicep similarity index 100% rename from modules/network/firewall-policies/.test/min/main.test.bicep rename to modules/network/firewall-policy/.test/min/main.test.bicep diff --git a/modules/network/firewall-policies/README.md b/modules/network/firewall-policy/README.md similarity index 98% rename from modules/network/firewall-policies/README.md rename to modules/network/firewall-policy/README.md index 4fa5644f8e..50d925df2a 100644 --- a/modules/network/firewall-policies/README.md +++ b/modules/network/firewall-policy/README.md @@ -156,7 +156,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module firewallPolicies './network/firewall-policies/main.bicep' = { +module firewallPolicies './network/firewall-policy/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nfpcom' params: { // Required parameters @@ -297,7 +297,7 @@ module firewallPolicies './network/firewall-policies/main.bicep' = { via Bicep module ```bicep -module firewallPolicies './network/firewall-policies/main.bicep' = { +module firewallPolicies './network/firewall-policy/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nfpmin' params: { // Required parameters diff --git a/modules/network/firewall-policies/main.bicep b/modules/network/firewall-policy/main.bicep similarity index 98% rename from modules/network/firewall-policies/main.bicep rename to modules/network/firewall-policy/main.bicep index cdc0605192..1d1047a64b 100644 --- a/modules/network/firewall-policies/main.bicep +++ b/modules/network/firewall-policy/main.bicep @@ -176,7 +176,7 @@ resource firewallPolicy 'Microsoft.Network/firewallPolicies@2022-07-01' = { // because of concurrent access to the base policy. // The next line forces ARM to deploy them one after the other, so no race concition on the base policy will happen. @batchSize(1) -module firewallPolicy_ruleCollectionGroups 'rule-collection-groups/main.bicep' = [for (ruleCollectionGroup, index) in ruleCollectionGroups: { +module firewallPolicy_ruleCollectionGroups 'rule-collection-group/main.bicep' = [for (ruleCollectionGroup, index) in ruleCollectionGroups: { name: '${uniqueString(deployment().name, location)}-firewallPolicy_ruleCollectionGroups-${index}' params: { firewallPolicyName: firewallPolicy.name diff --git a/modules/network/firewall-policies/main.json b/modules/network/firewall-policy/main.json similarity index 100% rename from modules/network/firewall-policies/main.json rename to modules/network/firewall-policy/main.json diff --git a/modules/network/firewall-policies/rule-collection-groups/README.md b/modules/network/firewall-policy/rule-collection-groups/README.md similarity index 100% rename from modules/network/firewall-policies/rule-collection-groups/README.md rename to modules/network/firewall-policy/rule-collection-groups/README.md diff --git a/modules/network/firewall-policies/rule-collection-groups/main.bicep b/modules/network/firewall-policy/rule-collection-groups/main.bicep similarity index 100% rename from modules/network/firewall-policies/rule-collection-groups/main.bicep rename to modules/network/firewall-policy/rule-collection-groups/main.bicep diff --git a/modules/network/firewall-policies/rule-collection-groups/main.json b/modules/network/firewall-policy/rule-collection-groups/main.json similarity index 100% rename from modules/network/firewall-policies/rule-collection-groups/main.json rename to modules/network/firewall-policy/rule-collection-groups/main.json diff --git a/modules/network/firewall-policies/rule-collection-groups/version.json b/modules/network/firewall-policy/rule-collection-groups/version.json similarity index 100% rename from modules/network/firewall-policies/rule-collection-groups/version.json rename to modules/network/firewall-policy/rule-collection-groups/version.json diff --git a/modules/network/firewall-policies/version.json b/modules/network/firewall-policy/version.json similarity index 100% rename from modules/network/firewall-policies/version.json rename to modules/network/firewall-policy/version.json diff --git a/modules/network/front-doors/.bicep/nested_roleAssignments.bicep b/modules/network/front-door/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/front-doors/.bicep/nested_roleAssignments.bicep rename to modules/network/front-door/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/front-doors/.test/common/dependencies.bicep b/modules/network/front-door/.test/common/dependencies.bicep similarity index 100% rename from modules/network/front-doors/.test/common/dependencies.bicep rename to modules/network/front-door/.test/common/dependencies.bicep diff --git a/modules/network/front-doors/.test/common/main.test.bicep b/modules/network/front-door/.test/common/main.test.bicep similarity index 100% rename from modules/network/front-doors/.test/common/main.test.bicep rename to modules/network/front-door/.test/common/main.test.bicep diff --git a/modules/network/front-doors/.test/main.test.bicep b/modules/network/front-door/.test/main.test.bicep similarity index 100% rename from modules/network/front-doors/.test/main.test.bicep rename to modules/network/front-door/.test/main.test.bicep diff --git a/modules/network/front-doors/.test/min/main.test.bicep b/modules/network/front-door/.test/min/main.test.bicep similarity index 100% rename from modules/network/front-doors/.test/min/main.test.bicep rename to modules/network/front-door/.test/min/main.test.bicep diff --git a/modules/network/front-doors/README.md b/modules/network/front-door/README.md similarity index 99% rename from modules/network/front-doors/README.md rename to modules/network/front-door/README.md index d85123fd89..4ff3adfee7 100644 --- a/modules/network/front-doors/README.md +++ b/modules/network/front-door/README.md @@ -180,7 +180,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module frontDoors './network/front-doors/main.bicep' = { +module frontDoors './network/front-door/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nfdcom' params: { // Required parameters @@ -451,7 +451,7 @@ module frontDoors './network/front-doors/main.bicep' = { via Bicep module ```bicep -module frontDoors './network/front-doors/main.bicep' = { +module frontDoors './network/front-door/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nfdmin' params: { // Required parameters diff --git a/modules/network/front-doors/main.bicep b/modules/network/front-door/main.bicep similarity index 100% rename from modules/network/front-doors/main.bicep rename to modules/network/front-door/main.bicep diff --git a/modules/network/front-doors/main.json b/modules/network/front-door/main.json similarity index 100% rename from modules/network/front-doors/main.json rename to modules/network/front-door/main.json diff --git a/modules/network/front-doors/version.json b/modules/network/front-door/version.json similarity index 100% rename from modules/network/front-doors/version.json rename to modules/network/front-door/version.json diff --git a/modules/network/ip-groups/.bicep/nested_roleAssignments.bicep b/modules/network/ip-group/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/ip-groups/.bicep/nested_roleAssignments.bicep rename to modules/network/ip-group/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/ip-groups/.test/common/dependencies.bicep b/modules/network/ip-group/.test/common/dependencies.bicep similarity index 100% rename from modules/network/ip-groups/.test/common/dependencies.bicep rename to modules/network/ip-group/.test/common/dependencies.bicep diff --git a/modules/network/ip-groups/.test/common/main.test.bicep b/modules/network/ip-group/.test/common/main.test.bicep similarity index 100% rename from modules/network/ip-groups/.test/common/main.test.bicep rename to modules/network/ip-group/.test/common/main.test.bicep diff --git a/modules/network/ip-groups/.test/main.test.bicep b/modules/network/ip-group/.test/main.test.bicep similarity index 100% rename from modules/network/ip-groups/.test/main.test.bicep rename to modules/network/ip-group/.test/main.test.bicep diff --git a/modules/network/ip-groups/.test/min/main.test.bicep b/modules/network/ip-group/.test/min/main.test.bicep similarity index 100% rename from modules/network/ip-groups/.test/min/main.test.bicep rename to modules/network/ip-group/.test/min/main.test.bicep diff --git a/modules/network/ip-groups/README.md b/modules/network/ip-group/README.md similarity index 98% rename from modules/network/ip-groups/README.md rename to modules/network/ip-group/README.md index 56d848f588..7c8e07c16d 100644 --- a/modules/network/ip-groups/README.md +++ b/modules/network/ip-group/README.md @@ -165,7 +165,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module ipGroups './network/ip-groups/main.bicep' = { +module ipGroups './network/ip-group/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nigcom' params: { // Required parameters @@ -254,7 +254,7 @@ module ipGroups './network/ip-groups/main.bicep' = { via Bicep module ```bicep -module ipGroups './network/ip-groups/main.bicep' = { +module ipGroups './network/ip-group/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nigmin' params: { // Required parameters diff --git a/modules/network/ip-groups/main.bicep b/modules/network/ip-group/main.bicep similarity index 100% rename from modules/network/ip-groups/main.bicep rename to modules/network/ip-group/main.bicep diff --git a/modules/network/ip-groups/main.json b/modules/network/ip-group/main.json similarity index 100% rename from modules/network/ip-groups/main.json rename to modules/network/ip-group/main.json diff --git a/modules/network/ip-groups/version.json b/modules/network/ip-group/version.json similarity index 100% rename from modules/network/ip-groups/version.json rename to modules/network/ip-group/version.json diff --git a/modules/network/load-balancers/.bicep/nested_roleAssignments.bicep b/modules/network/load-balancer/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/load-balancers/.bicep/nested_roleAssignments.bicep rename to modules/network/load-balancer/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/load-balancers/.test/common/dependencies.bicep b/modules/network/load-balancer/.test/common/dependencies.bicep similarity index 100% rename from modules/network/load-balancers/.test/common/dependencies.bicep rename to modules/network/load-balancer/.test/common/dependencies.bicep diff --git a/modules/network/load-balancers/.test/common/main.test.bicep b/modules/network/load-balancer/.test/common/main.test.bicep similarity index 100% rename from modules/network/load-balancers/.test/common/main.test.bicep rename to modules/network/load-balancer/.test/common/main.test.bicep diff --git a/modules/network/load-balancers/.test/internal/dependencies.bicep b/modules/network/load-balancer/.test/internal/dependencies.bicep similarity index 100% rename from modules/network/load-balancers/.test/internal/dependencies.bicep rename to modules/network/load-balancer/.test/internal/dependencies.bicep diff --git a/modules/network/load-balancers/.test/internal/main.test.bicep b/modules/network/load-balancer/.test/internal/main.test.bicep similarity index 100% rename from modules/network/load-balancers/.test/internal/main.test.bicep rename to modules/network/load-balancer/.test/internal/main.test.bicep diff --git a/modules/network/load-balancers/.test/main.test.bicep b/modules/network/load-balancer/.test/main.test.bicep similarity index 100% rename from modules/network/load-balancers/.test/main.test.bicep rename to modules/network/load-balancer/.test/main.test.bicep diff --git a/modules/network/load-balancers/.test/min/dependencies.bicep b/modules/network/load-balancer/.test/min/dependencies.bicep similarity index 100% rename from modules/network/load-balancers/.test/min/dependencies.bicep rename to modules/network/load-balancer/.test/min/dependencies.bicep diff --git a/modules/network/load-balancers/.test/min/main.test.bicep b/modules/network/load-balancer/.test/min/main.test.bicep similarity index 100% rename from modules/network/load-balancers/.test/min/main.test.bicep rename to modules/network/load-balancer/.test/min/main.test.bicep diff --git a/modules/network/load-balancers/README.md b/modules/network/load-balancer/README.md similarity index 99% rename from modules/network/load-balancers/README.md rename to modules/network/load-balancer/README.md index 5171c0f842..d39e44dfe7 100644 --- a/modules/network/load-balancers/README.md +++ b/modules/network/load-balancer/README.md @@ -478,7 +478,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module loadBalancers './network/load-balancers/main.bicep' = { +module loadBalancers './network/load-balancer/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nlbcom' params: { // Required parameters @@ -749,7 +749,7 @@ module loadBalancers './network/load-balancers/main.bicep' = { via Bicep module ```bicep -module loadBalancers './network/load-balancers/main.bicep' = { +module loadBalancers './network/load-balancer/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nlbint' params: { // Required parameters @@ -966,7 +966,7 @@ module loadBalancers './network/load-balancers/main.bicep' = { via Bicep module ```bicep -module loadBalancers './network/load-balancers/main.bicep' = { +module loadBalancers './network/load-balancer/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nlbmin' params: { // Required parameters diff --git a/modules/network/load-balancers/backend-address-pools/README.md b/modules/network/load-balancer/backend-address-pools/README.md similarity index 100% rename from modules/network/load-balancers/backend-address-pools/README.md rename to modules/network/load-balancer/backend-address-pools/README.md diff --git a/modules/network/load-balancers/backend-address-pools/main.bicep b/modules/network/load-balancer/backend-address-pools/main.bicep similarity index 100% rename from modules/network/load-balancers/backend-address-pools/main.bicep rename to modules/network/load-balancer/backend-address-pools/main.bicep diff --git a/modules/network/load-balancers/backend-address-pools/main.json b/modules/network/load-balancer/backend-address-pools/main.json similarity index 100% rename from modules/network/load-balancers/backend-address-pools/main.json rename to modules/network/load-balancer/backend-address-pools/main.json diff --git a/modules/network/load-balancers/backend-address-pools/version.json b/modules/network/load-balancer/backend-address-pools/version.json similarity index 100% rename from modules/network/load-balancers/backend-address-pools/version.json rename to modules/network/load-balancer/backend-address-pools/version.json diff --git a/modules/network/load-balancers/inbound-nat-rules/README.md b/modules/network/load-balancer/inbound-nat-rules/README.md similarity index 100% rename from modules/network/load-balancers/inbound-nat-rules/README.md rename to modules/network/load-balancer/inbound-nat-rules/README.md diff --git a/modules/network/load-balancers/inbound-nat-rules/main.bicep b/modules/network/load-balancer/inbound-nat-rules/main.bicep similarity index 100% rename from modules/network/load-balancers/inbound-nat-rules/main.bicep rename to modules/network/load-balancer/inbound-nat-rules/main.bicep diff --git a/modules/network/load-balancers/inbound-nat-rules/main.json b/modules/network/load-balancer/inbound-nat-rules/main.json similarity index 100% rename from modules/network/load-balancers/inbound-nat-rules/main.json rename to modules/network/load-balancer/inbound-nat-rules/main.json diff --git a/modules/network/load-balancers/inbound-nat-rules/version.json b/modules/network/load-balancer/inbound-nat-rules/version.json similarity index 100% rename from modules/network/load-balancers/inbound-nat-rules/version.json rename to modules/network/load-balancer/inbound-nat-rules/version.json diff --git a/modules/network/load-balancers/main.bicep b/modules/network/load-balancer/main.bicep similarity index 98% rename from modules/network/load-balancers/main.bicep rename to modules/network/load-balancer/main.bicep index 97e336e188..704f5029de 100644 --- a/modules/network/load-balancers/main.bicep +++ b/modules/network/load-balancer/main.bicep @@ -196,7 +196,7 @@ resource loadBalancer 'Microsoft.Network/loadBalancers@2022-07-01' = { } } -module loadBalancer_backendAddressPools 'backend-address-pools/main.bicep' = [for (backendAddressPool, index) in backendAddressPools: { +module loadBalancer_backendAddressPools 'backend-address-pool/main.bicep' = [for (backendAddressPool, index) in backendAddressPools: { name: '${uniqueString(deployment().name, location)}-loadBalancer-backendAddressPools-${index}' params: { loadBalancerName: loadBalancer.name @@ -208,7 +208,7 @@ module loadBalancer_backendAddressPools 'backend-address-pools/main.bicep' = [fo } }] -module loadBalancer_inboundNATRules 'inbound-nat-rules/main.bicep' = [for (inboundNATRule, index) in inboundNatRules: { +module loadBalancer_inboundNATRules 'inbound-nat-rule/main.bicep' = [for (inboundNATRule, index) in inboundNatRules: { name: '${uniqueString(deployment().name, location)}-LoadBalancer-inboundNatRules-${index}' params: { loadBalancerName: loadBalancer.name diff --git a/modules/network/load-balancers/main.json b/modules/network/load-balancer/main.json similarity index 100% rename from modules/network/load-balancers/main.json rename to modules/network/load-balancer/main.json diff --git a/modules/network/load-balancers/version.json b/modules/network/load-balancer/version.json similarity index 100% rename from modules/network/load-balancers/version.json rename to modules/network/load-balancer/version.json diff --git a/modules/network/local-network-gateways/.bicep/nested_roleAssignments.bicep b/modules/network/local-network-gateway/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/local-network-gateways/.bicep/nested_roleAssignments.bicep rename to modules/network/local-network-gateway/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/local-network-gateways/.test/common/dependencies.bicep b/modules/network/local-network-gateway/.test/common/dependencies.bicep similarity index 100% rename from modules/network/local-network-gateways/.test/common/dependencies.bicep rename to modules/network/local-network-gateway/.test/common/dependencies.bicep diff --git a/modules/network/local-network-gateways/.test/common/main.test.bicep b/modules/network/local-network-gateway/.test/common/main.test.bicep similarity index 100% rename from modules/network/local-network-gateways/.test/common/main.test.bicep rename to modules/network/local-network-gateway/.test/common/main.test.bicep diff --git a/modules/network/local-network-gateways/.test/main.test.bicep b/modules/network/local-network-gateway/.test/main.test.bicep similarity index 100% rename from modules/network/local-network-gateways/.test/main.test.bicep rename to modules/network/local-network-gateway/.test/main.test.bicep diff --git a/modules/network/local-network-gateways/.test/min/main.test.bicep b/modules/network/local-network-gateway/.test/min/main.test.bicep similarity index 100% rename from modules/network/local-network-gateways/.test/min/main.test.bicep rename to modules/network/local-network-gateway/.test/min/main.test.bicep diff --git a/modules/network/local-network-gateways/README.md b/modules/network/local-network-gateway/README.md similarity index 98% rename from modules/network/local-network-gateways/README.md rename to modules/network/local-network-gateway/README.md index 1927324425..d57c2e12b9 100644 --- a/modules/network/local-network-gateways/README.md +++ b/modules/network/local-network-gateway/README.md @@ -170,7 +170,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module localNetworkGateways './network/local-network-gateways/main.bicep' = { +module localNetworkGateways './network/local-network-gateway/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nlngcom' params: { // Required parameters @@ -269,7 +269,7 @@ module localNetworkGateways './network/local-network-gateways/main.bicep' = { via Bicep module ```bicep -module localNetworkGateways './network/local-network-gateways/main.bicep' = { +module localNetworkGateways './network/local-network-gateway/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nlngmin' params: { // Required parameters diff --git a/modules/network/local-network-gateways/main.bicep b/modules/network/local-network-gateway/main.bicep similarity index 100% rename from modules/network/local-network-gateways/main.bicep rename to modules/network/local-network-gateway/main.bicep diff --git a/modules/network/local-network-gateways/main.json b/modules/network/local-network-gateway/main.json similarity index 100% rename from modules/network/local-network-gateways/main.json rename to modules/network/local-network-gateway/main.json diff --git a/modules/network/local-network-gateways/version.json b/modules/network/local-network-gateway/version.json similarity index 100% rename from modules/network/local-network-gateways/version.json rename to modules/network/local-network-gateway/version.json diff --git a/modules/network/nat-gateways/.bicep/nested_roleAssignments.bicep b/modules/network/nat-gateway/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/nat-gateways/.bicep/nested_roleAssignments.bicep rename to modules/network/nat-gateway/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/nat-gateways/.test/common/dependencies.bicep b/modules/network/nat-gateway/.test/common/dependencies.bicep similarity index 100% rename from modules/network/nat-gateways/.test/common/dependencies.bicep rename to modules/network/nat-gateway/.test/common/dependencies.bicep diff --git a/modules/network/nat-gateways/.test/common/main.test.bicep b/modules/network/nat-gateway/.test/common/main.test.bicep similarity index 100% rename from modules/network/nat-gateways/.test/common/main.test.bicep rename to modules/network/nat-gateway/.test/common/main.test.bicep diff --git a/modules/network/nat-gateways/.test/main.test.bicep b/modules/network/nat-gateway/.test/main.test.bicep similarity index 100% rename from modules/network/nat-gateways/.test/main.test.bicep rename to modules/network/nat-gateway/.test/main.test.bicep diff --git a/modules/network/nat-gateways/README.md b/modules/network/nat-gateway/README.md similarity index 99% rename from modules/network/nat-gateways/README.md rename to modules/network/nat-gateway/README.md index 7c409853b8..6eb2c2a26e 100644 --- a/modules/network/nat-gateways/README.md +++ b/modules/network/nat-gateway/README.md @@ -186,7 +186,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module natGateways './network/nat-gateways/main.bicep' = { +module natGateways './network/nat-gateway/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nngcom' params: { // Required parameters diff --git a/modules/network/nat-gateways/main.bicep b/modules/network/nat-gateway/main.bicep similarity index 98% rename from modules/network/nat-gateways/main.bicep rename to modules/network/nat-gateway/main.bicep index 4b295c8cd6..f6f114fe2d 100644 --- a/modules/network/nat-gateways/main.bicep +++ b/modules/network/nat-gateway/main.bicep @@ -113,7 +113,7 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (ena // PUBLIC IP // ========= -module publicIPAddress '../public-ip-addresses/main.bicep' = if (natGatewayPublicIpAddress) { +module publicIPAddress '../public-ip-address/main.bicep' = if (natGatewayPublicIpAddress) { name: '${uniqueString(deployment().name, location)}-NatGateway-PIP' params: { name: !empty(natGatewayPipName) ? natGatewayPipName : '${name}-pip' diff --git a/modules/network/nat-gateways/main.json b/modules/network/nat-gateway/main.json similarity index 100% rename from modules/network/nat-gateways/main.json rename to modules/network/nat-gateway/main.json diff --git a/modules/network/nat-gateways/version.json b/modules/network/nat-gateway/version.json similarity index 100% rename from modules/network/nat-gateways/version.json rename to modules/network/nat-gateway/version.json diff --git a/modules/network/network-interfaces/.bicep/nested_roleAssignments.bicep b/modules/network/network-interface/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/network-interfaces/.bicep/nested_roleAssignments.bicep rename to modules/network/network-interface/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/network-interfaces/.test/common/dependencies.bicep b/modules/network/network-interface/.test/common/dependencies.bicep similarity index 100% rename from modules/network/network-interfaces/.test/common/dependencies.bicep rename to modules/network/network-interface/.test/common/dependencies.bicep diff --git a/modules/network/network-interfaces/.test/common/main.test.bicep b/modules/network/network-interface/.test/common/main.test.bicep similarity index 100% rename from modules/network/network-interfaces/.test/common/main.test.bicep rename to modules/network/network-interface/.test/common/main.test.bicep diff --git a/modules/network/network-interfaces/.test/main.test.bicep b/modules/network/network-interface/.test/main.test.bicep similarity index 100% rename from modules/network/network-interfaces/.test/main.test.bicep rename to modules/network/network-interface/.test/main.test.bicep diff --git a/modules/network/network-interfaces/.test/min/dependencies.bicep b/modules/network/network-interface/.test/min/dependencies.bicep similarity index 100% rename from modules/network/network-interfaces/.test/min/dependencies.bicep rename to modules/network/network-interface/.test/min/dependencies.bicep diff --git a/modules/network/network-interfaces/.test/min/main.test.bicep b/modules/network/network-interface/.test/min/main.test.bicep similarity index 100% rename from modules/network/network-interfaces/.test/min/main.test.bicep rename to modules/network/network-interface/.test/min/main.test.bicep diff --git a/modules/network/network-interfaces/README.md b/modules/network/network-interface/README.md similarity index 98% rename from modules/network/network-interfaces/README.md rename to modules/network/network-interface/README.md index aaaff2a5a4..ebc15fc596 100644 --- a/modules/network/network-interfaces/README.md +++ b/modules/network/network-interface/README.md @@ -200,7 +200,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module networkInterfaces './network/network-interfaces/main.bicep' = { +module networkInterfaces './network/network-interface/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nnicom' params: { // Required parameters @@ -349,7 +349,7 @@ module networkInterfaces './network/network-interfaces/main.bicep' = { via Bicep module ```bicep -module networkInterfaces './network/network-interfaces/main.bicep' = { +module networkInterfaces './network/network-interface/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nnimin' params: { // Required parameters diff --git a/modules/network/network-interfaces/main.bicep b/modules/network/network-interface/main.bicep similarity index 100% rename from modules/network/network-interfaces/main.bicep rename to modules/network/network-interface/main.bicep diff --git a/modules/network/network-interfaces/main.json b/modules/network/network-interface/main.json similarity index 100% rename from modules/network/network-interfaces/main.json rename to modules/network/network-interface/main.json diff --git a/modules/network/network-interfaces/version.json b/modules/network/network-interface/version.json similarity index 100% rename from modules/network/network-interfaces/version.json rename to modules/network/network-interface/version.json diff --git a/modules/network/network-managers/.bicep/nested_roleAssignments.bicep b/modules/network/network-manager/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/network-managers/.bicep/nested_roleAssignments.bicep rename to modules/network/network-manager/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/network-managers/.test/common/dependencies.bicep b/modules/network/network-manager/.test/common/dependencies.bicep similarity index 100% rename from modules/network/network-managers/.test/common/dependencies.bicep rename to modules/network/network-manager/.test/common/dependencies.bicep diff --git a/modules/network/network-managers/.test/common/main.test.bicep b/modules/network/network-manager/.test/common/main.test.bicep similarity index 100% rename from modules/network/network-managers/.test/common/main.test.bicep rename to modules/network/network-manager/.test/common/main.test.bicep diff --git a/modules/network/network-managers/.test/main.test.bicep b/modules/network/network-manager/.test/main.test.bicep similarity index 100% rename from modules/network/network-managers/.test/main.test.bicep rename to modules/network/network-manager/.test/main.test.bicep diff --git a/modules/network/network-managers/README.md b/modules/network/network-manager/README.md similarity index 99% rename from modules/network/network-managers/README.md rename to modules/network/network-manager/README.md index 23484d370b..e95812c026 100644 --- a/modules/network/network-managers/README.md +++ b/modules/network/network-manager/README.md @@ -549,7 +549,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module networkManagers './network/network-managers/main.bicep' = { +module networkManagers './network/network-manager/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nnmcom' params: { // Required parameters diff --git a/modules/network/network-managers/connectivity-configurations/README.md b/modules/network/network-manager/connectivity-configurations/README.md similarity index 100% rename from modules/network/network-managers/connectivity-configurations/README.md rename to modules/network/network-manager/connectivity-configurations/README.md diff --git a/modules/network/network-managers/connectivity-configurations/main.bicep b/modules/network/network-manager/connectivity-configurations/main.bicep similarity index 100% rename from modules/network/network-managers/connectivity-configurations/main.bicep rename to modules/network/network-manager/connectivity-configurations/main.bicep diff --git a/modules/network/network-managers/connectivity-configurations/main.json b/modules/network/network-manager/connectivity-configurations/main.json similarity index 100% rename from modules/network/network-managers/connectivity-configurations/main.json rename to modules/network/network-manager/connectivity-configurations/main.json diff --git a/modules/network/network-managers/connectivity-configurations/version.json b/modules/network/network-manager/connectivity-configurations/version.json similarity index 100% rename from modules/network/network-managers/connectivity-configurations/version.json rename to modules/network/network-manager/connectivity-configurations/version.json diff --git a/modules/network/network-managers/main.bicep b/modules/network/network-manager/main.bicep similarity index 94% rename from modules/network/network-managers/main.bicep rename to modules/network/network-manager/main.bicep index 3892394090..3a1164faca 100644 --- a/modules/network/network-managers/main.bicep +++ b/modules/network/network-manager/main.bicep @@ -74,7 +74,7 @@ resource networkManager 'Microsoft.Network/networkManagers@2023-02-01' = { } } -module networkManager_networkGroups 'network-groups/main.bicep' = [for (networkGroup, index) in networkGroups: { +module networkManager_networkGroups 'network-group/main.bicep' = [for (networkGroup, index) in networkGroups: { name: '${uniqueString(deployment().name, location)}-NetworkManager-NetworkGroups-${index}' params: { name: networkGroup.name @@ -85,7 +85,7 @@ module networkManager_networkGroups 'network-groups/main.bicep' = [for (networkG } }] -module networkManager_connectivityConfigurations 'connectivity-configurations/main.bicep' = [for (connectivityConfiguration, index) in connectivityConfigurations: { +module networkManager_connectivityConfigurations 'connectivity-configuration/main.bicep' = [for (connectivityConfiguration, index) in connectivityConfigurations: { name: '${uniqueString(deployment().name, location)}-NetworkManager-ConnectivityConfigurations-${index}' params: { name: connectivityConfiguration.name @@ -101,7 +101,7 @@ module networkManager_connectivityConfigurations 'connectivity-configurations/ma dependsOn: networkManager_networkGroups }] -module networkManager_scopeConnections 'scope-connections/main.bicep' = [for (scopeConnection, index) in scopeConnections: { +module networkManager_scopeConnections 'scope-connection/main.bicep' = [for (scopeConnection, index) in scopeConnections: { name: '${uniqueString(deployment().name, location)}-NetworkManager-ScopeConnections-${index}' params: { name: scopeConnection.name @@ -113,7 +113,7 @@ module networkManager_scopeConnections 'scope-connections/main.bicep' = [for (sc } }] -module networkManager_securityAdminConfigurations 'security-admin-configurations/main.bicep' = [for (securityAdminConfiguration, index) in securityAdminConfigurations: { +module networkManager_securityAdminConfigurations 'security-admin-configuration/main.bicep' = [for (securityAdminConfiguration, index) in securityAdminConfigurations: { name: '${uniqueString(deployment().name, location)}-NetworkManager-SecurityAdminConfigurations-${index}' params: { name: securityAdminConfiguration.name diff --git a/modules/network/network-managers/main.json b/modules/network/network-manager/main.json similarity index 100% rename from modules/network/network-managers/main.json rename to modules/network/network-manager/main.json diff --git a/modules/network/network-managers/network-groups/README.md b/modules/network/network-manager/network-groups/README.md similarity index 100% rename from modules/network/network-managers/network-groups/README.md rename to modules/network/network-manager/network-groups/README.md diff --git a/modules/network/network-managers/network-groups/main.bicep b/modules/network/network-manager/network-groups/main.bicep similarity index 95% rename from modules/network/network-managers/network-groups/main.bicep rename to modules/network/network-manager/network-groups/main.bicep index 099a1fc663..83ebe0ec80 100644 --- a/modules/network/network-managers/network-groups/main.bicep +++ b/modules/network/network-manager/network-groups/main.bicep @@ -46,7 +46,7 @@ resource networkGroup 'Microsoft.Network/networkManagers/networkGroups@2023-02-0 } } -module networkGroup_staticMembers 'static-members/main.bicep' = [for (staticMember, index) in staticMembers: { +module networkGroup_staticMembers 'static-member/main.bicep' = [for (staticMember, index) in staticMembers: { name: '${uniqueString(deployment().name)}-NetworkGroup-StaticMembers-${index}' params: { networkManagerName: networkManager.name diff --git a/modules/network/network-managers/network-groups/main.json b/modules/network/network-manager/network-groups/main.json similarity index 100% rename from modules/network/network-managers/network-groups/main.json rename to modules/network/network-manager/network-groups/main.json diff --git a/modules/network/network-managers/network-groups/static-members/README.md b/modules/network/network-manager/network-groups/static-members/README.md similarity index 100% rename from modules/network/network-managers/network-groups/static-members/README.md rename to modules/network/network-manager/network-groups/static-members/README.md diff --git a/modules/network/network-managers/network-groups/static-members/main.bicep b/modules/network/network-manager/network-groups/static-members/main.bicep similarity index 100% rename from modules/network/network-managers/network-groups/static-members/main.bicep rename to modules/network/network-manager/network-groups/static-members/main.bicep diff --git a/modules/network/network-managers/network-groups/static-members/main.json b/modules/network/network-manager/network-groups/static-members/main.json similarity index 100% rename from modules/network/network-managers/network-groups/static-members/main.json rename to modules/network/network-manager/network-groups/static-members/main.json diff --git a/modules/network/network-managers/network-groups/static-members/version.json b/modules/network/network-manager/network-groups/static-members/version.json similarity index 100% rename from modules/network/network-managers/network-groups/static-members/version.json rename to modules/network/network-manager/network-groups/static-members/version.json diff --git a/modules/network/network-managers/network-groups/version.json b/modules/network/network-manager/network-groups/version.json similarity index 100% rename from modules/network/network-managers/network-groups/version.json rename to modules/network/network-manager/network-groups/version.json diff --git a/modules/network/network-managers/scope-connections/README.md b/modules/network/network-manager/scope-connections/README.md similarity index 100% rename from modules/network/network-managers/scope-connections/README.md rename to modules/network/network-manager/scope-connections/README.md diff --git a/modules/network/network-managers/scope-connections/main.bicep b/modules/network/network-manager/scope-connections/main.bicep similarity index 100% rename from modules/network/network-managers/scope-connections/main.bicep rename to modules/network/network-manager/scope-connections/main.bicep diff --git a/modules/network/network-managers/scope-connections/main.json b/modules/network/network-manager/scope-connections/main.json similarity index 100% rename from modules/network/network-managers/scope-connections/main.json rename to modules/network/network-manager/scope-connections/main.json diff --git a/modules/network/network-managers/scope-connections/version.json b/modules/network/network-manager/scope-connections/version.json similarity index 100% rename from modules/network/network-managers/scope-connections/version.json rename to modules/network/network-manager/scope-connections/version.json diff --git a/modules/network/network-managers/security-admin-configurations/README.md b/modules/network/network-manager/security-admin-configurations/README.md similarity index 100% rename from modules/network/network-managers/security-admin-configurations/README.md rename to modules/network/network-manager/security-admin-configurations/README.md diff --git a/modules/network/network-managers/security-admin-configurations/main.bicep b/modules/network/network-manager/security-admin-configurations/main.bicep similarity index 97% rename from modules/network/network-managers/security-admin-configurations/main.bicep rename to modules/network/network-manager/security-admin-configurations/main.bicep index b7bceb4fac..8d470520e3 100644 --- a/modules/network/network-managers/security-admin-configurations/main.bicep +++ b/modules/network/network-manager/security-admin-configurations/main.bicep @@ -55,7 +55,7 @@ resource securityAdminConfigurations 'Microsoft.Network/networkManagers/security } } -module securityAdminConfigurations_ruleCollections 'rule-collections/main.bicep' = [for (ruleCollection, index) in ruleCollections: { +module securityAdminConfigurations_ruleCollections 'rule-collection/main.bicep' = [for (ruleCollection, index) in ruleCollections: { name: '${uniqueString(deployment().name)}-SecurityAdminConfigurations-RuleCollections-${index}' params: { networkManagerName: networkManager.name diff --git a/modules/network/network-managers/security-admin-configurations/main.json b/modules/network/network-manager/security-admin-configurations/main.json similarity index 100% rename from modules/network/network-managers/security-admin-configurations/main.json rename to modules/network/network-manager/security-admin-configurations/main.json diff --git a/modules/network/network-managers/security-admin-configurations/rule-collections/README.md b/modules/network/network-manager/security-admin-configurations/rule-collections/README.md similarity index 100% rename from modules/network/network-managers/security-admin-configurations/rule-collections/README.md rename to modules/network/network-manager/security-admin-configurations/rule-collections/README.md diff --git a/modules/network/network-managers/security-admin-configurations/rule-collections/main.bicep b/modules/network/network-manager/security-admin-configurations/rule-collections/main.bicep similarity index 97% rename from modules/network/network-managers/security-admin-configurations/rule-collections/main.bicep rename to modules/network/network-manager/security-admin-configurations/rule-collections/main.bicep index 78e8f9e2e0..f0d1cef059 100644 --- a/modules/network/network-managers/security-admin-configurations/rule-collections/main.bicep +++ b/modules/network/network-manager/security-admin-configurations/rule-collections/main.bicep @@ -57,7 +57,7 @@ resource ruleCollection 'Microsoft.Network/networkManagers/securityAdminConfigur } } -module securityAdminConfigurations_rules 'rules/main.bicep' = [for (rule, index) in rules: { +module securityAdminConfigurations_rules 'rule/main.bicep' = [for (rule, index) in rules: { name: '${uniqueString(deployment().name)}-RuleCollections-Rules-${index}' params: { networkManagerName: networkManager.name diff --git a/modules/network/network-managers/security-admin-configurations/rule-collections/main.json b/modules/network/network-manager/security-admin-configurations/rule-collections/main.json similarity index 100% rename from modules/network/network-managers/security-admin-configurations/rule-collections/main.json rename to modules/network/network-manager/security-admin-configurations/rule-collections/main.json diff --git a/modules/network/network-managers/security-admin-configurations/rule-collections/rules/README.md b/modules/network/network-manager/security-admin-configurations/rule-collections/rules/README.md similarity index 100% rename from modules/network/network-managers/security-admin-configurations/rule-collections/rules/README.md rename to modules/network/network-manager/security-admin-configurations/rule-collections/rules/README.md diff --git a/modules/network/network-managers/security-admin-configurations/rule-collections/rules/main.bicep b/modules/network/network-manager/security-admin-configurations/rule-collections/rules/main.bicep similarity index 100% rename from modules/network/network-managers/security-admin-configurations/rule-collections/rules/main.bicep rename to modules/network/network-manager/security-admin-configurations/rule-collections/rules/main.bicep diff --git a/modules/network/network-managers/security-admin-configurations/rule-collections/rules/main.json b/modules/network/network-manager/security-admin-configurations/rule-collections/rules/main.json similarity index 100% rename from modules/network/network-managers/security-admin-configurations/rule-collections/rules/main.json rename to modules/network/network-manager/security-admin-configurations/rule-collections/rules/main.json diff --git a/modules/network/network-managers/security-admin-configurations/rule-collections/rules/version.json b/modules/network/network-manager/security-admin-configurations/rule-collections/rules/version.json similarity index 100% rename from modules/network/network-managers/security-admin-configurations/rule-collections/rules/version.json rename to modules/network/network-manager/security-admin-configurations/rule-collections/rules/version.json diff --git a/modules/network/network-managers/security-admin-configurations/rule-collections/version.json b/modules/network/network-manager/security-admin-configurations/rule-collections/version.json similarity index 100% rename from modules/network/network-managers/security-admin-configurations/rule-collections/version.json rename to modules/network/network-manager/security-admin-configurations/rule-collections/version.json diff --git a/modules/network/network-managers/security-admin-configurations/version.json b/modules/network/network-manager/security-admin-configurations/version.json similarity index 100% rename from modules/network/network-managers/security-admin-configurations/version.json rename to modules/network/network-manager/security-admin-configurations/version.json diff --git a/modules/network/network-managers/version.json b/modules/network/network-manager/version.json similarity index 100% rename from modules/network/network-managers/version.json rename to modules/network/network-manager/version.json diff --git a/modules/network/network-security-groups/.bicep/nested_roleAssignments.bicep b/modules/network/network-security-group/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/network-security-groups/.bicep/nested_roleAssignments.bicep rename to modules/network/network-security-group/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/network-security-groups/.test/common/dependencies.bicep b/modules/network/network-security-group/.test/common/dependencies.bicep similarity index 100% rename from modules/network/network-security-groups/.test/common/dependencies.bicep rename to modules/network/network-security-group/.test/common/dependencies.bicep diff --git a/modules/network/network-security-groups/.test/common/main.test.bicep b/modules/network/network-security-group/.test/common/main.test.bicep similarity index 100% rename from modules/network/network-security-groups/.test/common/main.test.bicep rename to modules/network/network-security-group/.test/common/main.test.bicep diff --git a/modules/network/network-security-groups/.test/main.test.bicep b/modules/network/network-security-group/.test/main.test.bicep similarity index 100% rename from modules/network/network-security-groups/.test/main.test.bicep rename to modules/network/network-security-group/.test/main.test.bicep diff --git a/modules/network/network-security-groups/.test/min/main.test.bicep b/modules/network/network-security-group/.test/min/main.test.bicep similarity index 100% rename from modules/network/network-security-groups/.test/min/main.test.bicep rename to modules/network/network-security-group/.test/min/main.test.bicep diff --git a/modules/network/network-security-groups/README.md b/modules/network/network-security-group/README.md similarity index 98% rename from modules/network/network-security-groups/README.md rename to modules/network/network-security-group/README.md index 20d5e8844a..e47405e177 100644 --- a/modules/network/network-security-groups/README.md +++ b/modules/network/network-security-group/README.md @@ -175,7 +175,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module networkSecurityGroups './network/network-security-groups/main.bicep' = { +module networkSecurityGroups './network/network-security-group/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nnsgcom' params: { // Required parameters @@ -404,7 +404,7 @@ module networkSecurityGroups './network/network-security-groups/main.bicep' = { via Bicep module ```bicep -module networkSecurityGroups './network/network-security-groups/main.bicep' = { +module networkSecurityGroups './network/network-security-group/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nnsgmin' params: { // Required parameters diff --git a/modules/network/network-security-groups/main.bicep b/modules/network/network-security-group/main.bicep similarity index 98% rename from modules/network/network-security-groups/main.bicep rename to modules/network/network-security-group/main.bicep index 4e6f4e859c..8503d03244 100644 --- a/modules/network/network-security-groups/main.bicep +++ b/modules/network/network-security-group/main.bicep @@ -125,7 +125,7 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2022-07-0 } } -module networkSecurityGroup_securityRules 'security-rules/main.bicep' = [for (securityRule, index) in securityRules: { +module networkSecurityGroup_securityRules 'security-rule/main.bicep' = [for (securityRule, index) in securityRules: { name: '${uniqueString(deployment().name, location)}-securityRule-${index}' params: { name: securityRule.name diff --git a/modules/network/network-security-groups/main.json b/modules/network/network-security-group/main.json similarity index 100% rename from modules/network/network-security-groups/main.json rename to modules/network/network-security-group/main.json diff --git a/modules/network/network-security-groups/security-rules/README.md b/modules/network/network-security-group/security-rules/README.md similarity index 100% rename from modules/network/network-security-groups/security-rules/README.md rename to modules/network/network-security-group/security-rules/README.md diff --git a/modules/network/network-security-groups/security-rules/main.bicep b/modules/network/network-security-group/security-rules/main.bicep similarity index 100% rename from modules/network/network-security-groups/security-rules/main.bicep rename to modules/network/network-security-group/security-rules/main.bicep diff --git a/modules/network/network-security-groups/security-rules/main.json b/modules/network/network-security-group/security-rules/main.json similarity index 100% rename from modules/network/network-security-groups/security-rules/main.json rename to modules/network/network-security-group/security-rules/main.json diff --git a/modules/network/network-security-groups/security-rules/version.json b/modules/network/network-security-group/security-rules/version.json similarity index 100% rename from modules/network/network-security-groups/security-rules/version.json rename to modules/network/network-security-group/security-rules/version.json diff --git a/modules/network/network-security-groups/version.json b/modules/network/network-security-group/version.json similarity index 100% rename from modules/network/network-security-groups/version.json rename to modules/network/network-security-group/version.json diff --git a/modules/network/network-watchers/.bicep/nested_roleAssignments.bicep b/modules/network/network-watcher/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/network-watchers/.bicep/nested_roleAssignments.bicep rename to modules/network/network-watcher/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/network-watchers/.test/common/dependencies.bicep b/modules/network/network-watcher/.test/common/dependencies.bicep similarity index 100% rename from modules/network/network-watchers/.test/common/dependencies.bicep rename to modules/network/network-watcher/.test/common/dependencies.bicep diff --git a/modules/network/network-watchers/.test/common/main.test.bicep b/modules/network/network-watcher/.test/common/main.test.bicep similarity index 100% rename from modules/network/network-watchers/.test/common/main.test.bicep rename to modules/network/network-watcher/.test/common/main.test.bicep diff --git a/modules/network/network-watchers/.test/main.test.bicep b/modules/network/network-watcher/.test/main.test.bicep similarity index 100% rename from modules/network/network-watchers/.test/main.test.bicep rename to modules/network/network-watcher/.test/main.test.bicep diff --git a/modules/network/network-watchers/.test/min/main.test.bicep b/modules/network/network-watcher/.test/min/main.test.bicep similarity index 100% rename from modules/network/network-watchers/.test/min/main.test.bicep rename to modules/network/network-watcher/.test/min/main.test.bicep diff --git a/modules/network/network-watchers/README.md b/modules/network/network-watcher/README.md similarity index 98% rename from modules/network/network-watchers/README.md rename to modules/network/network-watcher/README.md index 2260de2c10..8fcf765ec5 100644 --- a/modules/network/network-watchers/README.md +++ b/modules/network/network-watcher/README.md @@ -163,7 +163,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module networkWatchers './network/network-watchers/main.bicep' = { +module networkWatchers './network/network-watcher/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nnwcom' params: { connectionMonitors: [ @@ -380,7 +380,7 @@ module networkWatchers './network/network-watchers/main.bicep' = { via Bicep module ```bicep -module networkWatchers './network/network-watchers/main.bicep' = { +module networkWatchers './network/network-watcher/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nnwmin' params: { enableDefaultTelemetry: '' diff --git a/modules/network/network-watchers/connection-monitors/README.md b/modules/network/network-watcher/connection-monitors/README.md similarity index 100% rename from modules/network/network-watchers/connection-monitors/README.md rename to modules/network/network-watcher/connection-monitors/README.md diff --git a/modules/network/network-watchers/connection-monitors/main.bicep b/modules/network/network-watcher/connection-monitors/main.bicep similarity index 100% rename from modules/network/network-watchers/connection-monitors/main.bicep rename to modules/network/network-watcher/connection-monitors/main.bicep diff --git a/modules/network/network-watchers/connection-monitors/main.json b/modules/network/network-watcher/connection-monitors/main.json similarity index 100% rename from modules/network/network-watchers/connection-monitors/main.json rename to modules/network/network-watcher/connection-monitors/main.json diff --git a/modules/network/network-watchers/connection-monitors/version.json b/modules/network/network-watcher/connection-monitors/version.json similarity index 100% rename from modules/network/network-watchers/connection-monitors/version.json rename to modules/network/network-watcher/connection-monitors/version.json diff --git a/modules/network/network-watchers/flow-logs/README.md b/modules/network/network-watcher/flow-logs/README.md similarity index 100% rename from modules/network/network-watchers/flow-logs/README.md rename to modules/network/network-watcher/flow-logs/README.md diff --git a/modules/network/network-watchers/flow-logs/main.bicep b/modules/network/network-watcher/flow-logs/main.bicep similarity index 100% rename from modules/network/network-watchers/flow-logs/main.bicep rename to modules/network/network-watcher/flow-logs/main.bicep diff --git a/modules/network/network-watchers/flow-logs/main.json b/modules/network/network-watcher/flow-logs/main.json similarity index 100% rename from modules/network/network-watchers/flow-logs/main.json rename to modules/network/network-watcher/flow-logs/main.json diff --git a/modules/network/network-watchers/flow-logs/version.json b/modules/network/network-watcher/flow-logs/version.json similarity index 100% rename from modules/network/network-watchers/flow-logs/version.json rename to modules/network/network-watcher/flow-logs/version.json diff --git a/modules/network/network-watchers/main.bicep b/modules/network/network-watcher/main.bicep similarity index 95% rename from modules/network/network-watchers/main.bicep rename to modules/network/network-watcher/main.bicep index 44b2509030..b88325faf5 100644 --- a/modules/network/network-watchers/main.bicep +++ b/modules/network/network-watcher/main.bicep @@ -75,7 +75,7 @@ module networkWatcher_roleAssignments '.bicep/nested_roleAssignments.bicep' = [f } }] -module networkWatcher_connectionMonitors 'connection-monitors/main.bicep' = [for (connectionMonitor, index) in connectionMonitors: { +module networkWatcher_connectionMonitors 'connection-monitor/main.bicep' = [for (connectionMonitor, index) in connectionMonitors: { name: '${uniqueString(deployment().name, location)}-NW-ConnectionMonitor-${index}' params: { endpoints: contains(connectionMonitor, 'endpoints') ? connectionMonitor.endpoints : [] @@ -88,7 +88,7 @@ module networkWatcher_connectionMonitors 'connection-monitors/main.bicep' = [for } }] -module networkWatcher_flowLogs 'flow-logs/main.bicep' = [for (flowLog, index) in flowLogs: { +module networkWatcher_flowLogs 'flow-log/main.bicep' = [for (flowLog, index) in flowLogs: { name: '${uniqueString(deployment().name, location)}-NW-FlowLog-${index}' params: { enabled: contains(flowLog, 'enabled') ? flowLog.enabled : true diff --git a/modules/network/network-watchers/main.json b/modules/network/network-watcher/main.json similarity index 100% rename from modules/network/network-watchers/main.json rename to modules/network/network-watcher/main.json diff --git a/modules/network/network-watchers/version.json b/modules/network/network-watcher/version.json similarity index 100% rename from modules/network/network-watchers/version.json rename to modules/network/network-watcher/version.json diff --git a/modules/network/private-dns-zones/.bicep/nested_roleAssignments.bicep b/modules/network/private-dns-zone/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/private-dns-zones/.bicep/nested_roleAssignments.bicep rename to modules/network/private-dns-zone/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/private-dns-zones/.test/common/dependencies.bicep b/modules/network/private-dns-zone/.test/common/dependencies.bicep similarity index 100% rename from modules/network/private-dns-zones/.test/common/dependencies.bicep rename to modules/network/private-dns-zone/.test/common/dependencies.bicep diff --git a/modules/network/private-dns-zones/.test/common/main.test.bicep b/modules/network/private-dns-zone/.test/common/main.test.bicep similarity index 100% rename from modules/network/private-dns-zones/.test/common/main.test.bicep rename to modules/network/private-dns-zone/.test/common/main.test.bicep diff --git a/modules/network/private-dns-zones/.test/main.test.bicep b/modules/network/private-dns-zone/.test/main.test.bicep similarity index 100% rename from modules/network/private-dns-zones/.test/main.test.bicep rename to modules/network/private-dns-zone/.test/main.test.bicep diff --git a/modules/network/private-dns-zones/.test/min/main.test.bicep b/modules/network/private-dns-zone/.test/min/main.test.bicep similarity index 100% rename from modules/network/private-dns-zones/.test/min/main.test.bicep rename to modules/network/private-dns-zone/.test/min/main.test.bicep diff --git a/modules/network/private-dns-zones/README.md b/modules/network/private-dns-zone/README.md similarity index 99% rename from modules/network/private-dns-zones/README.md rename to modules/network/private-dns-zone/README.md index ce4d6e732c..253bfa546a 100644 --- a/modules/network/private-dns-zones/README.md +++ b/modules/network/private-dns-zone/README.md @@ -182,7 +182,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module privateDnsZones './network/private-dns-zones/main.bicep' = { +module privateDnsZones './network/private-dns-zone/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-npdzcom' params: { // Required parameters @@ -609,7 +609,7 @@ module privateDnsZones './network/private-dns-zones/main.bicep' = { via Bicep module ```bicep -module privateDnsZones './network/private-dns-zones/main.bicep' = { +module privateDnsZones './network/private-dns-zone/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-npdzmin' params: { // Required parameters diff --git a/modules/network/private-dns-zones/a/.bicep/nested_roleAssignments.bicep b/modules/network/private-dns-zone/a/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/private-dns-zones/a/.bicep/nested_roleAssignments.bicep rename to modules/network/private-dns-zone/a/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/private-dns-zones/a/README.md b/modules/network/private-dns-zone/a/README.md similarity index 100% rename from modules/network/private-dns-zones/a/README.md rename to modules/network/private-dns-zone/a/README.md diff --git a/modules/network/private-dns-zones/a/main.bicep b/modules/network/private-dns-zone/a/main.bicep similarity index 100% rename from modules/network/private-dns-zones/a/main.bicep rename to modules/network/private-dns-zone/a/main.bicep diff --git a/modules/network/private-dns-zones/a/main.json b/modules/network/private-dns-zone/a/main.json similarity index 100% rename from modules/network/private-dns-zones/a/main.json rename to modules/network/private-dns-zone/a/main.json diff --git a/modules/network/private-dns-zones/a/version.json b/modules/network/private-dns-zone/a/version.json similarity index 100% rename from modules/network/private-dns-zones/a/version.json rename to modules/network/private-dns-zone/a/version.json diff --git a/modules/network/private-dns-zones/aaaa/.bicep/nested_roleAssignments.bicep b/modules/network/private-dns-zone/aaaa/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/private-dns-zones/aaaa/.bicep/nested_roleAssignments.bicep rename to modules/network/private-dns-zone/aaaa/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/private-dns-zones/aaaa/README.md b/modules/network/private-dns-zone/aaaa/README.md similarity index 100% rename from modules/network/private-dns-zones/aaaa/README.md rename to modules/network/private-dns-zone/aaaa/README.md diff --git a/modules/network/private-dns-zones/aaaa/main.bicep b/modules/network/private-dns-zone/aaaa/main.bicep similarity index 100% rename from modules/network/private-dns-zones/aaaa/main.bicep rename to modules/network/private-dns-zone/aaaa/main.bicep diff --git a/modules/network/private-dns-zones/aaaa/main.json b/modules/network/private-dns-zone/aaaa/main.json similarity index 100% rename from modules/network/private-dns-zones/aaaa/main.json rename to modules/network/private-dns-zone/aaaa/main.json diff --git a/modules/network/private-dns-zones/aaaa/version.json b/modules/network/private-dns-zone/aaaa/version.json similarity index 100% rename from modules/network/private-dns-zones/aaaa/version.json rename to modules/network/private-dns-zone/aaaa/version.json diff --git a/modules/network/private-dns-zones/cname/.bicep/nested_roleAssignments.bicep b/modules/network/private-dns-zone/cname/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/private-dns-zones/cname/.bicep/nested_roleAssignments.bicep rename to modules/network/private-dns-zone/cname/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/private-dns-zones/cname/README.md b/modules/network/private-dns-zone/cname/README.md similarity index 100% rename from modules/network/private-dns-zones/cname/README.md rename to modules/network/private-dns-zone/cname/README.md diff --git a/modules/network/private-dns-zones/cname/main.bicep b/modules/network/private-dns-zone/cname/main.bicep similarity index 100% rename from modules/network/private-dns-zones/cname/main.bicep rename to modules/network/private-dns-zone/cname/main.bicep diff --git a/modules/network/private-dns-zones/cname/main.json b/modules/network/private-dns-zone/cname/main.json similarity index 100% rename from modules/network/private-dns-zones/cname/main.json rename to modules/network/private-dns-zone/cname/main.json diff --git a/modules/network/private-dns-zones/cname/version.json b/modules/network/private-dns-zone/cname/version.json similarity index 100% rename from modules/network/private-dns-zones/cname/version.json rename to modules/network/private-dns-zone/cname/version.json diff --git a/modules/network/private-dns-zones/main.bicep b/modules/network/private-dns-zone/main.bicep similarity index 98% rename from modules/network/private-dns-zones/main.bicep rename to modules/network/private-dns-zone/main.bicep index c9c747ed2c..75d433791a 100644 --- a/modules/network/private-dns-zones/main.bicep +++ b/modules/network/private-dns-zone/main.bicep @@ -176,7 +176,7 @@ module privateDnsZone_TXT 'txt/main.bicep' = [for (txtRecord, index) in txt: { } }] -module privateDnsZone_virtualNetworkLinks 'virtual-network-links/main.bicep' = [for (virtualNetworkLink, index) in virtualNetworkLinks: { +module privateDnsZone_virtualNetworkLinks 'virtual-network-link/main.bicep' = [for (virtualNetworkLink, index) in virtualNetworkLinks: { name: '${uniqueString(deployment().name, location)}-PrivateDnsZone-VirtualNetworkLink-${index}' params: { privateDnsZoneName: privateDnsZone.name diff --git a/modules/network/private-dns-zones/main.json b/modules/network/private-dns-zone/main.json similarity index 100% rename from modules/network/private-dns-zones/main.json rename to modules/network/private-dns-zone/main.json diff --git a/modules/network/private-dns-zones/mx/.bicep/nested_roleAssignments.bicep b/modules/network/private-dns-zone/mx/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/private-dns-zones/mx/.bicep/nested_roleAssignments.bicep rename to modules/network/private-dns-zone/mx/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/private-dns-zones/mx/README.md b/modules/network/private-dns-zone/mx/README.md similarity index 100% rename from modules/network/private-dns-zones/mx/README.md rename to modules/network/private-dns-zone/mx/README.md diff --git a/modules/network/private-dns-zones/mx/main.bicep b/modules/network/private-dns-zone/mx/main.bicep similarity index 100% rename from modules/network/private-dns-zones/mx/main.bicep rename to modules/network/private-dns-zone/mx/main.bicep diff --git a/modules/network/private-dns-zones/mx/main.json b/modules/network/private-dns-zone/mx/main.json similarity index 100% rename from modules/network/private-dns-zones/mx/main.json rename to modules/network/private-dns-zone/mx/main.json diff --git a/modules/network/private-dns-zones/mx/version.json b/modules/network/private-dns-zone/mx/version.json similarity index 100% rename from modules/network/private-dns-zones/mx/version.json rename to modules/network/private-dns-zone/mx/version.json diff --git a/modules/network/private-dns-zones/ptr/.bicep/nested_roleAssignments.bicep b/modules/network/private-dns-zone/ptr/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/private-dns-zones/ptr/.bicep/nested_roleAssignments.bicep rename to modules/network/private-dns-zone/ptr/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/private-dns-zones/ptr/README.md b/modules/network/private-dns-zone/ptr/README.md similarity index 100% rename from modules/network/private-dns-zones/ptr/README.md rename to modules/network/private-dns-zone/ptr/README.md diff --git a/modules/network/private-dns-zones/ptr/main.bicep b/modules/network/private-dns-zone/ptr/main.bicep similarity index 100% rename from modules/network/private-dns-zones/ptr/main.bicep rename to modules/network/private-dns-zone/ptr/main.bicep diff --git a/modules/network/private-dns-zones/ptr/main.json b/modules/network/private-dns-zone/ptr/main.json similarity index 100% rename from modules/network/private-dns-zones/ptr/main.json rename to modules/network/private-dns-zone/ptr/main.json diff --git a/modules/network/private-dns-zones/ptr/version.json b/modules/network/private-dns-zone/ptr/version.json similarity index 100% rename from modules/network/private-dns-zones/ptr/version.json rename to modules/network/private-dns-zone/ptr/version.json diff --git a/modules/network/private-dns-zones/soa/.bicep/nested_roleAssignments.bicep b/modules/network/private-dns-zone/soa/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/private-dns-zones/soa/.bicep/nested_roleAssignments.bicep rename to modules/network/private-dns-zone/soa/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/private-dns-zones/soa/README.md b/modules/network/private-dns-zone/soa/README.md similarity index 100% rename from modules/network/private-dns-zones/soa/README.md rename to modules/network/private-dns-zone/soa/README.md diff --git a/modules/network/private-dns-zones/soa/main.bicep b/modules/network/private-dns-zone/soa/main.bicep similarity index 100% rename from modules/network/private-dns-zones/soa/main.bicep rename to modules/network/private-dns-zone/soa/main.bicep diff --git a/modules/network/private-dns-zones/soa/main.json b/modules/network/private-dns-zone/soa/main.json similarity index 100% rename from modules/network/private-dns-zones/soa/main.json rename to modules/network/private-dns-zone/soa/main.json diff --git a/modules/network/private-dns-zones/soa/version.json b/modules/network/private-dns-zone/soa/version.json similarity index 100% rename from modules/network/private-dns-zones/soa/version.json rename to modules/network/private-dns-zone/soa/version.json diff --git a/modules/network/private-dns-zones/srv/.bicep/nested_roleAssignments.bicep b/modules/network/private-dns-zone/srv/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/private-dns-zones/srv/.bicep/nested_roleAssignments.bicep rename to modules/network/private-dns-zone/srv/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/private-dns-zones/srv/README.md b/modules/network/private-dns-zone/srv/README.md similarity index 100% rename from modules/network/private-dns-zones/srv/README.md rename to modules/network/private-dns-zone/srv/README.md diff --git a/modules/network/private-dns-zones/srv/main.bicep b/modules/network/private-dns-zone/srv/main.bicep similarity index 100% rename from modules/network/private-dns-zones/srv/main.bicep rename to modules/network/private-dns-zone/srv/main.bicep diff --git a/modules/network/private-dns-zones/srv/main.json b/modules/network/private-dns-zone/srv/main.json similarity index 100% rename from modules/network/private-dns-zones/srv/main.json rename to modules/network/private-dns-zone/srv/main.json diff --git a/modules/network/private-dns-zones/srv/version.json b/modules/network/private-dns-zone/srv/version.json similarity index 100% rename from modules/network/private-dns-zones/srv/version.json rename to modules/network/private-dns-zone/srv/version.json diff --git a/modules/network/private-dns-zones/txt/.bicep/nested_roleAssignments.bicep b/modules/network/private-dns-zone/txt/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/private-dns-zones/txt/.bicep/nested_roleAssignments.bicep rename to modules/network/private-dns-zone/txt/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/private-dns-zones/txt/README.md b/modules/network/private-dns-zone/txt/README.md similarity index 100% rename from modules/network/private-dns-zones/txt/README.md rename to modules/network/private-dns-zone/txt/README.md diff --git a/modules/network/private-dns-zones/txt/main.bicep b/modules/network/private-dns-zone/txt/main.bicep similarity index 100% rename from modules/network/private-dns-zones/txt/main.bicep rename to modules/network/private-dns-zone/txt/main.bicep diff --git a/modules/network/private-dns-zones/txt/main.json b/modules/network/private-dns-zone/txt/main.json similarity index 100% rename from modules/network/private-dns-zones/txt/main.json rename to modules/network/private-dns-zone/txt/main.json diff --git a/modules/network/private-dns-zones/txt/version.json b/modules/network/private-dns-zone/txt/version.json similarity index 100% rename from modules/network/private-dns-zones/txt/version.json rename to modules/network/private-dns-zone/txt/version.json diff --git a/modules/network/private-dns-zones/version.json b/modules/network/private-dns-zone/version.json similarity index 100% rename from modules/network/private-dns-zones/version.json rename to modules/network/private-dns-zone/version.json diff --git a/modules/network/private-dns-zones/virtual-network-links/README.md b/modules/network/private-dns-zone/virtual-network-links/README.md similarity index 100% rename from modules/network/private-dns-zones/virtual-network-links/README.md rename to modules/network/private-dns-zone/virtual-network-links/README.md diff --git a/modules/network/private-dns-zones/virtual-network-links/main.bicep b/modules/network/private-dns-zone/virtual-network-links/main.bicep similarity index 100% rename from modules/network/private-dns-zones/virtual-network-links/main.bicep rename to modules/network/private-dns-zone/virtual-network-links/main.bicep diff --git a/modules/network/private-dns-zones/virtual-network-links/main.json b/modules/network/private-dns-zone/virtual-network-links/main.json similarity index 100% rename from modules/network/private-dns-zones/virtual-network-links/main.json rename to modules/network/private-dns-zone/virtual-network-links/main.json diff --git a/modules/network/private-dns-zones/virtual-network-links/version.json b/modules/network/private-dns-zone/virtual-network-links/version.json similarity index 100% rename from modules/network/private-dns-zones/virtual-network-links/version.json rename to modules/network/private-dns-zone/virtual-network-links/version.json diff --git a/modules/network/private-endpoints/.bicep/nested_roleAssignments.bicep b/modules/network/private-endpoint/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/private-endpoints/.bicep/nested_roleAssignments.bicep rename to modules/network/private-endpoint/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/private-endpoints/.test/common/dependencies.bicep b/modules/network/private-endpoint/.test/common/dependencies.bicep similarity index 100% rename from modules/network/private-endpoints/.test/common/dependencies.bicep rename to modules/network/private-endpoint/.test/common/dependencies.bicep diff --git a/modules/network/private-endpoints/.test/common/main.test.bicep b/modules/network/private-endpoint/.test/common/main.test.bicep similarity index 100% rename from modules/network/private-endpoints/.test/common/main.test.bicep rename to modules/network/private-endpoint/.test/common/main.test.bicep diff --git a/modules/network/private-endpoints/.test/main.test.bicep b/modules/network/private-endpoint/.test/main.test.bicep similarity index 100% rename from modules/network/private-endpoints/.test/main.test.bicep rename to modules/network/private-endpoint/.test/main.test.bicep diff --git a/modules/network/private-endpoints/.test/min/dependencies.bicep b/modules/network/private-endpoint/.test/min/dependencies.bicep similarity index 100% rename from modules/network/private-endpoints/.test/min/dependencies.bicep rename to modules/network/private-endpoint/.test/min/dependencies.bicep diff --git a/modules/network/private-endpoints/.test/min/main.test.bicep b/modules/network/private-endpoint/.test/min/main.test.bicep similarity index 100% rename from modules/network/private-endpoints/.test/min/main.test.bicep rename to modules/network/private-endpoint/.test/min/main.test.bicep diff --git a/modules/network/private-endpoints/README.md b/modules/network/private-endpoint/README.md similarity index 99% rename from modules/network/private-endpoints/README.md rename to modules/network/private-endpoint/README.md index 939a3d8332..740bb2a43d 100644 --- a/modules/network/private-endpoints/README.md +++ b/modules/network/private-endpoint/README.md @@ -297,7 +297,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module privateEndpoints './network/private-endpoints/main.bicep' = { +module privateEndpoints './network/private-endpoint/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-npecom' params: { // Required parameters @@ -442,7 +442,7 @@ module privateEndpoints './network/private-endpoints/main.bicep' = { via Bicep module ```bicep -module privateEndpoints './network/private-endpoints/main.bicep' = { +module privateEndpoints './network/private-endpoint/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-npemin' params: { // Required parameters diff --git a/modules/network/private-endpoints/main.bicep b/modules/network/private-endpoint/main.bicep similarity index 99% rename from modules/network/private-endpoints/main.bicep rename to modules/network/private-endpoint/main.bicep index 29aa7b966a..b0420647e1 100644 --- a/modules/network/private-endpoints/main.bicep +++ b/modules/network/private-endpoint/main.bicep @@ -92,7 +92,7 @@ resource privateEndpoint 'Microsoft.Network/privateEndpoints@2022-07-01' = { } } -module privateEndpoint_privateDnsZoneGroup 'private-dns-zone-groups/main.bicep' = if (!empty(privateDnsZoneGroup)) { +module privateEndpoint_privateDnsZoneGroup 'private-dns-zone-group/main.bicep' = if (!empty(privateDnsZoneGroup)) { name: '${uniqueString(deployment().name, location)}-PrivateEndpoint-PrivateDnsZoneGroup' params: { privateDNSResourceIds: privateDnsZoneGroup.privateDNSResourceIds diff --git a/modules/network/private-endpoints/main.json b/modules/network/private-endpoint/main.json similarity index 100% rename from modules/network/private-endpoints/main.json rename to modules/network/private-endpoint/main.json diff --git a/modules/network/private-endpoints/private-dns-zone-groups/README.md b/modules/network/private-endpoint/private-dns-zone-groups/README.md similarity index 100% rename from modules/network/private-endpoints/private-dns-zone-groups/README.md rename to modules/network/private-endpoint/private-dns-zone-groups/README.md diff --git a/modules/network/private-endpoints/private-dns-zone-groups/main.bicep b/modules/network/private-endpoint/private-dns-zone-groups/main.bicep similarity index 100% rename from modules/network/private-endpoints/private-dns-zone-groups/main.bicep rename to modules/network/private-endpoint/private-dns-zone-groups/main.bicep diff --git a/modules/network/private-endpoints/private-dns-zone-groups/main.json b/modules/network/private-endpoint/private-dns-zone-groups/main.json similarity index 100% rename from modules/network/private-endpoints/private-dns-zone-groups/main.json rename to modules/network/private-endpoint/private-dns-zone-groups/main.json diff --git a/modules/network/private-endpoints/private-dns-zone-groups/version.json b/modules/network/private-endpoint/private-dns-zone-groups/version.json similarity index 100% rename from modules/network/private-endpoints/private-dns-zone-groups/version.json rename to modules/network/private-endpoint/private-dns-zone-groups/version.json diff --git a/modules/network/private-endpoints/version.json b/modules/network/private-endpoint/version.json similarity index 100% rename from modules/network/private-endpoints/version.json rename to modules/network/private-endpoint/version.json diff --git a/modules/network/private-link-services/.bicep/nested_roleAssignments.bicep b/modules/network/private-link-service/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/private-link-services/.bicep/nested_roleAssignments.bicep rename to modules/network/private-link-service/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/private-link-services/.test/common/dependencies.bicep b/modules/network/private-link-service/.test/common/dependencies.bicep similarity index 100% rename from modules/network/private-link-services/.test/common/dependencies.bicep rename to modules/network/private-link-service/.test/common/dependencies.bicep diff --git a/modules/network/private-link-services/.test/common/main.test.bicep b/modules/network/private-link-service/.test/common/main.test.bicep similarity index 100% rename from modules/network/private-link-services/.test/common/main.test.bicep rename to modules/network/private-link-service/.test/common/main.test.bicep diff --git a/modules/network/private-link-services/.test/main.test.bicep b/modules/network/private-link-service/.test/main.test.bicep similarity index 100% rename from modules/network/private-link-services/.test/main.test.bicep rename to modules/network/private-link-service/.test/main.test.bicep diff --git a/modules/network/private-link-services/.test/min/dependencies.bicep b/modules/network/private-link-service/.test/min/dependencies.bicep similarity index 100% rename from modules/network/private-link-services/.test/min/dependencies.bicep rename to modules/network/private-link-service/.test/min/dependencies.bicep diff --git a/modules/network/private-link-services/.test/min/main.test.bicep b/modules/network/private-link-service/.test/min/main.test.bicep similarity index 100% rename from modules/network/private-link-services/.test/min/main.test.bicep rename to modules/network/private-link-service/.test/min/main.test.bicep diff --git a/modules/network/private-link-services/README.md b/modules/network/private-link-service/README.md similarity index 99% rename from modules/network/private-link-services/README.md rename to modules/network/private-link-service/README.md index b3581476ad..63574fc90e 100644 --- a/modules/network/private-link-services/README.md +++ b/modules/network/private-link-service/README.md @@ -440,7 +440,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module privateLinkServices './network/private-link-services/main.bicep' = { +module privateLinkServices './network/private-link-service/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nplscom' params: { // Required parameters @@ -593,7 +593,7 @@ module privateLinkServices './network/private-link-services/main.bicep' = { via Bicep module ```bicep -module privateLinkServices './network/private-link-services/main.bicep' = { +module privateLinkServices './network/private-link-service/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nplsmin' params: { // Required parameters diff --git a/modules/network/private-link-services/main.bicep b/modules/network/private-link-service/main.bicep similarity index 100% rename from modules/network/private-link-services/main.bicep rename to modules/network/private-link-service/main.bicep diff --git a/modules/network/private-link-services/main.json b/modules/network/private-link-service/main.json similarity index 100% rename from modules/network/private-link-services/main.json rename to modules/network/private-link-service/main.json diff --git a/modules/network/private-link-services/version.json b/modules/network/private-link-service/version.json similarity index 100% rename from modules/network/private-link-services/version.json rename to modules/network/private-link-service/version.json diff --git a/modules/network/public-ip-addresses/.bicep/nested_roleAssignments.bicep b/modules/network/public-ip-address/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/public-ip-addresses/.bicep/nested_roleAssignments.bicep rename to modules/network/public-ip-address/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/public-ip-addresses/.test/common/dependencies.bicep b/modules/network/public-ip-address/.test/common/dependencies.bicep similarity index 100% rename from modules/network/public-ip-addresses/.test/common/dependencies.bicep rename to modules/network/public-ip-address/.test/common/dependencies.bicep diff --git a/modules/network/public-ip-addresses/.test/common/main.test.bicep b/modules/network/public-ip-address/.test/common/main.test.bicep similarity index 100% rename from modules/network/public-ip-addresses/.test/common/main.test.bicep rename to modules/network/public-ip-address/.test/common/main.test.bicep diff --git a/modules/network/public-ip-addresses/.test/main.test.bicep b/modules/network/public-ip-address/.test/main.test.bicep similarity index 100% rename from modules/network/public-ip-addresses/.test/main.test.bicep rename to modules/network/public-ip-address/.test/main.test.bicep diff --git a/modules/network/public-ip-addresses/.test/min/main.test.bicep b/modules/network/public-ip-address/.test/min/main.test.bicep similarity index 100% rename from modules/network/public-ip-addresses/.test/min/main.test.bicep rename to modules/network/public-ip-address/.test/min/main.test.bicep diff --git a/modules/network/public-ip-addresses/README.md b/modules/network/public-ip-address/README.md similarity index 98% rename from modules/network/public-ip-addresses/README.md rename to modules/network/public-ip-address/README.md index debbdc591f..1e251b2fc8 100644 --- a/modules/network/public-ip-addresses/README.md +++ b/modules/network/public-ip-address/README.md @@ -183,7 +183,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module publicIPAddresses './network/public-ip-addresses/main.bicep' = { +module publicIPAddresses './network/public-ip-address/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-npiacom' params: { // Required parameters @@ -302,7 +302,7 @@ module publicIPAddresses './network/public-ip-addresses/main.bicep' = { via Bicep module ```bicep -module publicIPAddresses './network/public-ip-addresses/main.bicep' = { +module publicIPAddresses './network/public-ip-address/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-npiamin' params: { // Required parameters diff --git a/modules/network/public-ip-addresses/main.bicep b/modules/network/public-ip-address/main.bicep similarity index 100% rename from modules/network/public-ip-addresses/main.bicep rename to modules/network/public-ip-address/main.bicep diff --git a/modules/network/public-ip-addresses/main.json b/modules/network/public-ip-address/main.json similarity index 100% rename from modules/network/public-ip-addresses/main.json rename to modules/network/public-ip-address/main.json diff --git a/modules/network/public-ip-addresses/version.json b/modules/network/public-ip-address/version.json similarity index 100% rename from modules/network/public-ip-addresses/version.json rename to modules/network/public-ip-address/version.json diff --git a/modules/network/public-ip-prefixes/.bicep/nested_roleAssignments.bicep b/modules/network/public-ip-prefix/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/public-ip-prefixes/.bicep/nested_roleAssignments.bicep rename to modules/network/public-ip-prefix/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/public-ip-prefixes/.test/common/dependencies.bicep b/modules/network/public-ip-prefix/.test/common/dependencies.bicep similarity index 100% rename from modules/network/public-ip-prefixes/.test/common/dependencies.bicep rename to modules/network/public-ip-prefix/.test/common/dependencies.bicep diff --git a/modules/network/public-ip-prefixes/.test/common/main.test.bicep b/modules/network/public-ip-prefix/.test/common/main.test.bicep similarity index 100% rename from modules/network/public-ip-prefixes/.test/common/main.test.bicep rename to modules/network/public-ip-prefix/.test/common/main.test.bicep diff --git a/modules/network/public-ip-prefixes/.test/main.test.bicep b/modules/network/public-ip-prefix/.test/main.test.bicep similarity index 100% rename from modules/network/public-ip-prefixes/.test/main.test.bicep rename to modules/network/public-ip-prefix/.test/main.test.bicep diff --git a/modules/network/public-ip-prefixes/.test/min/main.test.bicep b/modules/network/public-ip-prefix/.test/min/main.test.bicep similarity index 100% rename from modules/network/public-ip-prefixes/.test/min/main.test.bicep rename to modules/network/public-ip-prefix/.test/min/main.test.bicep diff --git a/modules/network/public-ip-prefixes/README.md b/modules/network/public-ip-prefix/README.md similarity index 98% rename from modules/network/public-ip-prefixes/README.md rename to modules/network/public-ip-prefix/README.md index 625e80562d..2481033fde 100644 --- a/modules/network/public-ip-prefixes/README.md +++ b/modules/network/public-ip-prefix/README.md @@ -166,7 +166,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module publicIPPrefixes './network/public-ip-prefixes/main.bicep' = { +module publicIPPrefixes './network/public-ip-prefix/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-npipcom' params: { // Required parameters @@ -249,7 +249,7 @@ module publicIPPrefixes './network/public-ip-prefixes/main.bicep' = { via Bicep module ```bicep -module publicIPPrefixes './network/public-ip-prefixes/main.bicep' = { +module publicIPPrefixes './network/public-ip-prefix/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-npipmin' params: { // Required parameters diff --git a/modules/network/public-ip-prefixes/main.bicep b/modules/network/public-ip-prefix/main.bicep similarity index 100% rename from modules/network/public-ip-prefixes/main.bicep rename to modules/network/public-ip-prefix/main.bicep diff --git a/modules/network/public-ip-prefixes/main.json b/modules/network/public-ip-prefix/main.json similarity index 100% rename from modules/network/public-ip-prefixes/main.json rename to modules/network/public-ip-prefix/main.json diff --git a/modules/network/public-ip-prefixes/version.json b/modules/network/public-ip-prefix/version.json similarity index 100% rename from modules/network/public-ip-prefixes/version.json rename to modules/network/public-ip-prefix/version.json diff --git a/modules/network/route-tables/.bicep/nested_roleAssignments.bicep b/modules/network/route-table/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/route-tables/.bicep/nested_roleAssignments.bicep rename to modules/network/route-table/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/route-tables/.test/common/dependencies.bicep b/modules/network/route-table/.test/common/dependencies.bicep similarity index 100% rename from modules/network/route-tables/.test/common/dependencies.bicep rename to modules/network/route-table/.test/common/dependencies.bicep diff --git a/modules/network/route-tables/.test/common/main.test.bicep b/modules/network/route-table/.test/common/main.test.bicep similarity index 100% rename from modules/network/route-tables/.test/common/main.test.bicep rename to modules/network/route-table/.test/common/main.test.bicep diff --git a/modules/network/route-tables/.test/main.test.bicep b/modules/network/route-table/.test/main.test.bicep similarity index 100% rename from modules/network/route-tables/.test/main.test.bicep rename to modules/network/route-table/.test/main.test.bicep diff --git a/modules/network/route-tables/.test/min/main.test.bicep b/modules/network/route-table/.test/min/main.test.bicep similarity index 100% rename from modules/network/route-tables/.test/min/main.test.bicep rename to modules/network/route-table/.test/min/main.test.bicep diff --git a/modules/network/route-tables/README.md b/modules/network/route-table/README.md similarity index 98% rename from modules/network/route-tables/README.md rename to modules/network/route-table/README.md index f7448247f8..d7df9ab3b7 100644 --- a/modules/network/route-tables/README.md +++ b/modules/network/route-table/README.md @@ -255,7 +255,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module routeTables './network/route-tables/main.bicep' = { +module routeTables './network/route-table/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nrtcom' params: { // Required parameters @@ -356,7 +356,7 @@ module routeTables './network/route-tables/main.bicep' = { via Bicep module ```bicep -module routeTables './network/route-tables/main.bicep' = { +module routeTables './network/route-table/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nrtmin' params: { // Required parameters diff --git a/modules/network/route-tables/main.bicep b/modules/network/route-table/main.bicep similarity index 100% rename from modules/network/route-tables/main.bicep rename to modules/network/route-table/main.bicep diff --git a/modules/network/route-tables/main.json b/modules/network/route-table/main.json similarity index 100% rename from modules/network/route-tables/main.json rename to modules/network/route-table/main.json diff --git a/modules/network/route-tables/version.json b/modules/network/route-table/version.json similarity index 100% rename from modules/network/route-tables/version.json rename to modules/network/route-table/version.json diff --git a/modules/network/service-endpoint-policies/.bicep/nested_roleAssignments.bicep b/modules/network/service-endpoint-policy/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/service-endpoint-policies/.bicep/nested_roleAssignments.bicep rename to modules/network/service-endpoint-policy/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/service-endpoint-policies/.test/common/dependencies.bicep b/modules/network/service-endpoint-policy/.test/common/dependencies.bicep similarity index 100% rename from modules/network/service-endpoint-policies/.test/common/dependencies.bicep rename to modules/network/service-endpoint-policy/.test/common/dependencies.bicep diff --git a/modules/network/service-endpoint-policies/.test/common/main.test.bicep b/modules/network/service-endpoint-policy/.test/common/main.test.bicep similarity index 100% rename from modules/network/service-endpoint-policies/.test/common/main.test.bicep rename to modules/network/service-endpoint-policy/.test/common/main.test.bicep diff --git a/modules/network/service-endpoint-policies/.test/main.test.bicep b/modules/network/service-endpoint-policy/.test/main.test.bicep similarity index 100% rename from modules/network/service-endpoint-policies/.test/main.test.bicep rename to modules/network/service-endpoint-policy/.test/main.test.bicep diff --git a/modules/network/service-endpoint-policies/.test/min/main.test.bicep b/modules/network/service-endpoint-policy/.test/min/main.test.bicep similarity index 100% rename from modules/network/service-endpoint-policies/.test/min/main.test.bicep rename to modules/network/service-endpoint-policy/.test/min/main.test.bicep diff --git a/modules/network/service-endpoint-policies/README.md b/modules/network/service-endpoint-policy/README.md similarity index 99% rename from modules/network/service-endpoint-policies/README.md rename to modules/network/service-endpoint-policy/README.md index fe06b679af..47dcabc1ba 100644 --- a/modules/network/service-endpoint-policies/README.md +++ b/modules/network/service-endpoint-policy/README.md @@ -167,7 +167,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module serviceEndpointPolicies './network/service-endpoint-policies/main.bicep' = { +module serviceEndpointPolicies './network/service-endpoint-policy/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nsnpcom' params: { // Required parameters @@ -274,7 +274,7 @@ module serviceEndpointPolicies './network/service-endpoint-policies/main.bicep' via Bicep module ```bicep -module serviceEndpointPolicies './network/service-endpoint-policies/main.bicep' = { +module serviceEndpointPolicies './network/service-endpoint-policy/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nsnpmin' params: { // Required parameters diff --git a/modules/network/service-endpoint-policies/main.bicep b/modules/network/service-endpoint-policy/main.bicep similarity index 100% rename from modules/network/service-endpoint-policies/main.bicep rename to modules/network/service-endpoint-policy/main.bicep diff --git a/modules/network/service-endpoint-policies/main.json b/modules/network/service-endpoint-policy/main.json similarity index 100% rename from modules/network/service-endpoint-policies/main.json rename to modules/network/service-endpoint-policy/main.json diff --git a/modules/network/service-endpoint-policies/version.json b/modules/network/service-endpoint-policy/version.json similarity index 100% rename from modules/network/service-endpoint-policies/version.json rename to modules/network/service-endpoint-policy/version.json diff --git a/modules/network/trafficmanagerprofiles/.bicep/nested_roleAssignments.bicep b/modules/network/trafficmanagerprofile/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/trafficmanagerprofiles/.bicep/nested_roleAssignments.bicep rename to modules/network/trafficmanagerprofile/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/trafficmanagerprofiles/.test/common/dependencies.bicep b/modules/network/trafficmanagerprofile/.test/common/dependencies.bicep similarity index 100% rename from modules/network/trafficmanagerprofiles/.test/common/dependencies.bicep rename to modules/network/trafficmanagerprofile/.test/common/dependencies.bicep diff --git a/modules/network/trafficmanagerprofiles/.test/common/main.test.bicep b/modules/network/trafficmanagerprofile/.test/common/main.test.bicep similarity index 100% rename from modules/network/trafficmanagerprofiles/.test/common/main.test.bicep rename to modules/network/trafficmanagerprofile/.test/common/main.test.bicep diff --git a/modules/network/trafficmanagerprofiles/.test/main.test.bicep b/modules/network/trafficmanagerprofile/.test/main.test.bicep similarity index 100% rename from modules/network/trafficmanagerprofiles/.test/main.test.bicep rename to modules/network/trafficmanagerprofile/.test/main.test.bicep diff --git a/modules/network/trafficmanagerprofiles/.test/min/main.test.bicep b/modules/network/trafficmanagerprofile/.test/min/main.test.bicep similarity index 100% rename from modules/network/trafficmanagerprofiles/.test/min/main.test.bicep rename to modules/network/trafficmanagerprofile/.test/min/main.test.bicep diff --git a/modules/network/trafficmanagerprofiles/README.md b/modules/network/trafficmanagerprofile/README.md similarity index 98% rename from modules/network/trafficmanagerprofiles/README.md rename to modules/network/trafficmanagerprofile/README.md index 0280b933ac..828a88b445 100644 --- a/modules/network/trafficmanagerprofiles/README.md +++ b/modules/network/trafficmanagerprofile/README.md @@ -269,7 +269,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module trafficmanagerprofiles './network/trafficmanagerprofiles/main.bicep' = { +module trafficmanagerprofiles './network/trafficmanagerprofile/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ntmpcom' params: { // Required parameters @@ -372,7 +372,7 @@ module trafficmanagerprofiles './network/trafficmanagerprofiles/main.bicep' = { via Bicep module ```bicep -module trafficmanagerprofiles './network/trafficmanagerprofiles/main.bicep' = { +module trafficmanagerprofiles './network/trafficmanagerprofile/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ntmpmin' params: { // Required parameters diff --git a/modules/network/trafficmanagerprofiles/main.bicep b/modules/network/trafficmanagerprofile/main.bicep similarity index 100% rename from modules/network/trafficmanagerprofiles/main.bicep rename to modules/network/trafficmanagerprofile/main.bicep diff --git a/modules/network/trafficmanagerprofiles/main.json b/modules/network/trafficmanagerprofile/main.json similarity index 100% rename from modules/network/trafficmanagerprofiles/main.json rename to modules/network/trafficmanagerprofile/main.json diff --git a/modules/network/trafficmanagerprofiles/version.json b/modules/network/trafficmanagerprofile/version.json similarity index 100% rename from modules/network/trafficmanagerprofiles/version.json rename to modules/network/trafficmanagerprofile/version.json diff --git a/modules/network/virtual-hubs/.test/common/dependencies.bicep b/modules/network/virtual-hub/.test/common/dependencies.bicep similarity index 100% rename from modules/network/virtual-hubs/.test/common/dependencies.bicep rename to modules/network/virtual-hub/.test/common/dependencies.bicep diff --git a/modules/network/virtual-hubs/.test/common/main.test.bicep b/modules/network/virtual-hub/.test/common/main.test.bicep similarity index 100% rename from modules/network/virtual-hubs/.test/common/main.test.bicep rename to modules/network/virtual-hub/.test/common/main.test.bicep diff --git a/modules/network/virtual-hubs/.test/main.test.bicep b/modules/network/virtual-hub/.test/main.test.bicep similarity index 100% rename from modules/network/virtual-hubs/.test/main.test.bicep rename to modules/network/virtual-hub/.test/main.test.bicep diff --git a/modules/network/virtual-hubs/.test/min/dependencies.bicep b/modules/network/virtual-hub/.test/min/dependencies.bicep similarity index 100% rename from modules/network/virtual-hubs/.test/min/dependencies.bicep rename to modules/network/virtual-hub/.test/min/dependencies.bicep diff --git a/modules/network/virtual-hubs/.test/min/main.test.bicep b/modules/network/virtual-hub/.test/min/main.test.bicep similarity index 100% rename from modules/network/virtual-hubs/.test/min/main.test.bicep rename to modules/network/virtual-hub/.test/min/main.test.bicep diff --git a/modules/network/virtual-hubs/README.md b/modules/network/virtual-hub/README.md similarity index 98% rename from modules/network/virtual-hubs/README.md rename to modules/network/virtual-hub/README.md index 0e167fec0f..4925df1c7a 100644 --- a/modules/network/virtual-hubs/README.md +++ b/modules/network/virtual-hub/README.md @@ -122,7 +122,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module virtualHubs './network/virtual-hubs/main.bicep' = { +module virtualHubs './network/virtual-hub/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nvhcom' params: { // Required parameters @@ -245,7 +245,7 @@ module virtualHubs './network/virtual-hubs/main.bicep' = { via Bicep module ```bicep -module virtualHubs './network/virtual-hubs/main.bicep' = { +module virtualHubs './network/virtual-hub/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nvhmin' params: { // Required parameters diff --git a/modules/network/virtual-hubs/hub-route-tables/README.md b/modules/network/virtual-hub/hub-route-tables/README.md similarity index 100% rename from modules/network/virtual-hubs/hub-route-tables/README.md rename to modules/network/virtual-hub/hub-route-tables/README.md diff --git a/modules/network/virtual-hubs/hub-route-tables/main.bicep b/modules/network/virtual-hub/hub-route-tables/main.bicep similarity index 100% rename from modules/network/virtual-hubs/hub-route-tables/main.bicep rename to modules/network/virtual-hub/hub-route-tables/main.bicep diff --git a/modules/network/virtual-hubs/hub-route-tables/main.json b/modules/network/virtual-hub/hub-route-tables/main.json similarity index 100% rename from modules/network/virtual-hubs/hub-route-tables/main.json rename to modules/network/virtual-hub/hub-route-tables/main.json diff --git a/modules/network/virtual-hubs/hub-route-tables/version.json b/modules/network/virtual-hub/hub-route-tables/version.json similarity index 100% rename from modules/network/virtual-hubs/hub-route-tables/version.json rename to modules/network/virtual-hub/hub-route-tables/version.json diff --git a/modules/network/virtual-hubs/hub-virtual-network-connections/README.md b/modules/network/virtual-hub/hub-virtual-network-connections/README.md similarity index 100% rename from modules/network/virtual-hubs/hub-virtual-network-connections/README.md rename to modules/network/virtual-hub/hub-virtual-network-connections/README.md diff --git a/modules/network/virtual-hubs/hub-virtual-network-connections/main.bicep b/modules/network/virtual-hub/hub-virtual-network-connections/main.bicep similarity index 100% rename from modules/network/virtual-hubs/hub-virtual-network-connections/main.bicep rename to modules/network/virtual-hub/hub-virtual-network-connections/main.bicep diff --git a/modules/network/virtual-hubs/hub-virtual-network-connections/main.json b/modules/network/virtual-hub/hub-virtual-network-connections/main.json similarity index 100% rename from modules/network/virtual-hubs/hub-virtual-network-connections/main.json rename to modules/network/virtual-hub/hub-virtual-network-connections/main.json diff --git a/modules/network/virtual-hubs/hub-virtual-network-connections/version.json b/modules/network/virtual-hub/hub-virtual-network-connections/version.json similarity index 100% rename from modules/network/virtual-hubs/hub-virtual-network-connections/version.json rename to modules/network/virtual-hub/hub-virtual-network-connections/version.json diff --git a/modules/network/virtual-hubs/main.bicep b/modules/network/virtual-hub/main.bicep similarity index 96% rename from modules/network/virtual-hubs/main.bicep rename to modules/network/virtual-hub/main.bicep index e34bdccba0..282b1c1e98 100644 --- a/modules/network/virtual-hubs/main.bicep +++ b/modules/network/virtual-hub/main.bicep @@ -138,7 +138,7 @@ resource virtualHub_lock 'Microsoft.Authorization/locks@2020-05-01' = if (!empty scope: virtualHub } -module virtualHub_routeTables 'hub-route-tables/main.bicep' = [for (routeTable, index) in hubRouteTables: { +module virtualHub_routeTables 'hub-route-table/main.bicep' = [for (routeTable, index) in hubRouteTables: { name: '${uniqueString(deployment().name, location)}-routeTable-${index}' params: { virtualHubName: virtualHub.name @@ -149,7 +149,7 @@ module virtualHub_routeTables 'hub-route-tables/main.bicep' = [for (routeTable, } }] -module virtualHub_hubVirtualNetworkConnections 'hub-virtual-network-connections/main.bicep' = [for (virtualNetworkConnection, index) in hubVirtualNetworkConnections: { +module virtualHub_hubVirtualNetworkConnections 'hub-virtual-network-connection/main.bicep' = [for (virtualNetworkConnection, index) in hubVirtualNetworkConnections: { name: '${uniqueString(deployment().name, location)}-connection-${index}' params: { virtualHubName: virtualHub.name diff --git a/modules/network/virtual-hubs/main.json b/modules/network/virtual-hub/main.json similarity index 100% rename from modules/network/virtual-hubs/main.json rename to modules/network/virtual-hub/main.json diff --git a/modules/network/virtual-hubs/version.json b/modules/network/virtual-hub/version.json similarity index 100% rename from modules/network/virtual-hubs/version.json rename to modules/network/virtual-hub/version.json diff --git a/modules/network/virtual-network-gateways/.bicep/nested_roleAssignments.bicep b/modules/network/virtual-network-gateway/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/virtual-network-gateways/.bicep/nested_roleAssignments.bicep rename to modules/network/virtual-network-gateway/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/virtual-network-gateways/.test/aadvpn/dependencies.bicep b/modules/network/virtual-network-gateway/.test/aadvpn/dependencies.bicep similarity index 100% rename from modules/network/virtual-network-gateways/.test/aadvpn/dependencies.bicep rename to modules/network/virtual-network-gateway/.test/aadvpn/dependencies.bicep diff --git a/modules/network/virtual-network-gateways/.test/aadvpn/main.test.bicep b/modules/network/virtual-network-gateway/.test/aadvpn/main.test.bicep similarity index 100% rename from modules/network/virtual-network-gateways/.test/aadvpn/main.test.bicep rename to modules/network/virtual-network-gateway/.test/aadvpn/main.test.bicep diff --git a/modules/network/virtual-network-gateways/.test/expressRoute/dependencies.bicep b/modules/network/virtual-network-gateway/.test/expressRoute/dependencies.bicep similarity index 100% rename from modules/network/virtual-network-gateways/.test/expressRoute/dependencies.bicep rename to modules/network/virtual-network-gateway/.test/expressRoute/dependencies.bicep diff --git a/modules/network/virtual-network-gateways/.test/expressRoute/main.test.bicep b/modules/network/virtual-network-gateway/.test/expressRoute/main.test.bicep similarity index 100% rename from modules/network/virtual-network-gateways/.test/expressRoute/main.test.bicep rename to modules/network/virtual-network-gateway/.test/expressRoute/main.test.bicep diff --git a/modules/network/virtual-network-gateways/.test/main.test.bicep b/modules/network/virtual-network-gateway/.test/main.test.bicep similarity index 100% rename from modules/network/virtual-network-gateways/.test/main.test.bicep rename to modules/network/virtual-network-gateway/.test/main.test.bicep diff --git a/modules/network/virtual-network-gateways/.test/vpn/dependencies.bicep b/modules/network/virtual-network-gateway/.test/vpn/dependencies.bicep similarity index 100% rename from modules/network/virtual-network-gateways/.test/vpn/dependencies.bicep rename to modules/network/virtual-network-gateway/.test/vpn/dependencies.bicep diff --git a/modules/network/virtual-network-gateways/.test/vpn/main.test.bicep b/modules/network/virtual-network-gateway/.test/vpn/main.test.bicep similarity index 100% rename from modules/network/virtual-network-gateways/.test/vpn/main.test.bicep rename to modules/network/virtual-network-gateway/.test/vpn/main.test.bicep diff --git a/modules/network/virtual-network-gateways/README.md b/modules/network/virtual-network-gateway/README.md similarity index 99% rename from modules/network/virtual-network-gateways/README.md rename to modules/network/virtual-network-gateway/README.md index d8eb4cf5b1..dd2ea92a44 100644 --- a/modules/network/virtual-network-gateways/README.md +++ b/modules/network/virtual-network-gateway/README.md @@ -274,7 +274,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module virtualNetworkGateways './network/virtual-network-gateways/main.bicep' = { +module virtualNetworkGateways './network/virtual-network-gateway/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nvngavpn' params: { // Required parameters @@ -429,7 +429,7 @@ module virtualNetworkGateways './network/virtual-network-gateways/main.bicep' = via Bicep module ```bicep -module virtualNetworkGateways './network/virtual-network-gateways/main.bicep' = { +module virtualNetworkGateways './network/virtual-network-gateway/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nvger' params: { // Required parameters @@ -554,7 +554,7 @@ module virtualNetworkGateways './network/virtual-network-gateways/main.bicep' = via Bicep module ```bicep -module virtualNetworkGateways './network/virtual-network-gateways/main.bicep' = { +module virtualNetworkGateways './network/virtual-network-gateway/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nvgvpn' params: { // Required parameters diff --git a/modules/network/virtual-network-gateways/main.bicep b/modules/network/virtual-network-gateway/main.bicep similarity index 98% rename from modules/network/virtual-network-gateways/main.bicep rename to modules/network/virtual-network-gateway/main.bicep index 1a824d1033..79773ecd11 100644 --- a/modules/network/virtual-network-gateways/main.bicep +++ b/modules/network/virtual-network-gateway/main.bicep @@ -348,7 +348,7 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (ena // Public IPs @batchSize(1) -module publicIPAddress '../public-ip-addresses/main.bicep' = [for (virtualGatewayPublicIpName, index) in virtualGatewayPipNameVar: { +module publicIPAddress '../public-ip-address/main.bicep' = [for (virtualGatewayPublicIpName, index) in virtualGatewayPipNameVar: { name: virtualGatewayPublicIpName params: { name: virtualGatewayPublicIpName @@ -405,7 +405,7 @@ resource virtualNetworkGateway 'Microsoft.Network/virtualNetworkGateways@2022-07 ] } -module virtualNetworkGateway_natRules 'nat-rules/main.bicep' = [for (natRule, index) in natRules: { +module virtualNetworkGateway_natRules 'nat-rule/main.bicep' = [for (natRule, index) in natRules: { name: '${deployment().name}-NATRule-${index}' params: { name: natRule.name diff --git a/modules/network/virtual-network-gateways/main.json b/modules/network/virtual-network-gateway/main.json similarity index 100% rename from modules/network/virtual-network-gateways/main.json rename to modules/network/virtual-network-gateway/main.json diff --git a/modules/network/virtual-network-gateways/nat-rules/README.md b/modules/network/virtual-network-gateway/nat-rules/README.md similarity index 100% rename from modules/network/virtual-network-gateways/nat-rules/README.md rename to modules/network/virtual-network-gateway/nat-rules/README.md diff --git a/modules/network/virtual-network-gateways/nat-rules/main.bicep b/modules/network/virtual-network-gateway/nat-rules/main.bicep similarity index 100% rename from modules/network/virtual-network-gateways/nat-rules/main.bicep rename to modules/network/virtual-network-gateway/nat-rules/main.bicep diff --git a/modules/network/virtual-network-gateways/nat-rules/main.json b/modules/network/virtual-network-gateway/nat-rules/main.json similarity index 100% rename from modules/network/virtual-network-gateways/nat-rules/main.json rename to modules/network/virtual-network-gateway/nat-rules/main.json diff --git a/modules/network/virtual-network-gateways/nat-rules/version.json b/modules/network/virtual-network-gateway/nat-rules/version.json similarity index 100% rename from modules/network/virtual-network-gateways/nat-rules/version.json rename to modules/network/virtual-network-gateway/nat-rules/version.json diff --git a/modules/network/virtual-network-gateways/version.json b/modules/network/virtual-network-gateway/version.json similarity index 100% rename from modules/network/virtual-network-gateways/version.json rename to modules/network/virtual-network-gateway/version.json diff --git a/modules/network/virtual-networks/.bicep/nested_roleAssignments.bicep b/modules/network/virtual-network/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/virtual-networks/.bicep/nested_roleAssignments.bicep rename to modules/network/virtual-network/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/virtual-networks/.test/common/dependencies.bicep b/modules/network/virtual-network/.test/common/dependencies.bicep similarity index 100% rename from modules/network/virtual-networks/.test/common/dependencies.bicep rename to modules/network/virtual-network/.test/common/dependencies.bicep diff --git a/modules/network/virtual-networks/.test/common/main.test.bicep b/modules/network/virtual-network/.test/common/main.test.bicep similarity index 100% rename from modules/network/virtual-networks/.test/common/main.test.bicep rename to modules/network/virtual-network/.test/common/main.test.bicep diff --git a/modules/network/virtual-networks/.test/main.test.bicep b/modules/network/virtual-network/.test/main.test.bicep similarity index 100% rename from modules/network/virtual-networks/.test/main.test.bicep rename to modules/network/virtual-network/.test/main.test.bicep diff --git a/modules/network/virtual-networks/.test/min/main.test.bicep b/modules/network/virtual-network/.test/min/main.test.bicep similarity index 100% rename from modules/network/virtual-networks/.test/min/main.test.bicep rename to modules/network/virtual-network/.test/min/main.test.bicep diff --git a/modules/network/virtual-networks/.test/vnetPeering/dependencies.bicep b/modules/network/virtual-network/.test/vnetPeering/dependencies.bicep similarity index 100% rename from modules/network/virtual-networks/.test/vnetPeering/dependencies.bicep rename to modules/network/virtual-network/.test/vnetPeering/dependencies.bicep diff --git a/modules/network/virtual-networks/.test/vnetPeering/main.test.bicep b/modules/network/virtual-network/.test/vnetPeering/main.test.bicep similarity index 100% rename from modules/network/virtual-networks/.test/vnetPeering/main.test.bicep rename to modules/network/virtual-network/.test/vnetPeering/main.test.bicep diff --git a/modules/network/virtual-networks/README.md b/modules/network/virtual-network/README.md similarity index 99% rename from modules/network/virtual-networks/README.md rename to modules/network/virtual-network/README.md index ad5b4cc6f6..89e206b714 100644 --- a/modules/network/virtual-networks/README.md +++ b/modules/network/virtual-network/README.md @@ -371,7 +371,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module virtualNetworks './network/virtual-networks/main.bicep' = { +module virtualNetworks './network/virtual-network/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nvncom' params: { // Required parameters @@ -588,7 +588,7 @@ module virtualNetworks './network/virtual-networks/main.bicep' = { via Bicep module ```bicep -module virtualNetworks './network/virtual-networks/main.bicep' = { +module virtualNetworks './network/virtual-network/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nvnmin' params: { // Required parameters @@ -641,7 +641,7 @@ module virtualNetworks './network/virtual-networks/main.bicep' = { via Bicep module ```bicep -module virtualNetworks './network/virtual-networks/main.bicep' = { +module virtualNetworks './network/virtual-network/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nvnpeer' params: { // Required parameters diff --git a/modules/network/virtual-networks/main.bicep b/modules/network/virtual-network/main.bicep similarity index 97% rename from modules/network/virtual-networks/main.bicep rename to modules/network/virtual-network/main.bicep index 1783d7ebb6..90f857a94e 100644 --- a/modules/network/virtual-networks/main.bicep +++ b/modules/network/virtual-network/main.bicep @@ -194,7 +194,7 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { // You can safely remove the below child module (virtualNetwork_subnets) in your consumption of the module (virtualNetworks) to reduce the template size and duplication. //NOTE End : ------------------------------------ -module virtualNetwork_subnets 'subnets/main.bicep' = [for (subnet, index) in subnets: { +module virtualNetwork_subnets 'subnet/main.bicep' = [for (subnet, index) in subnets: { name: '${uniqueString(deployment().name, location)}-subnet-${index}' params: { virtualNetworkName: virtualNetwork.name @@ -217,7 +217,7 @@ module virtualNetwork_subnets 'subnets/main.bicep' = [for (subnet, index) in sub }] // Local to Remote peering -module virtualNetwork_peering_local 'virtual-network-peerings/main.bicep' = [for (peering, index) in peerings: { +module virtualNetwork_peering_local 'virtual-network-peering/main.bicep' = [for (peering, index) in peerings: { name: '${uniqueString(deployment().name, location)}-virtualNetworkPeering-local-${index}' params: { localVnetName: virtualNetwork.name @@ -233,7 +233,7 @@ module virtualNetwork_peering_local 'virtual-network-peerings/main.bicep' = [for }] // Remote to local peering (reverse) -module virtualNetwork_peering_remote 'virtual-network-peerings/main.bicep' = [for (peering, index) in peerings: if (contains(peering, 'remotePeeringEnabled') ? peering.remotePeeringEnabled == true : false) { +module virtualNetwork_peering_remote 'virtual-network-peering/main.bicep' = [for (peering, index) in peerings: if (contains(peering, 'remotePeeringEnabled') ? peering.remotePeeringEnabled == true : false) { name: '${uniqueString(deployment().name, location)}-virtualNetworkPeering-remote-${index}' scope: resourceGroup(split(peering.remoteVirtualNetworkId, '/')[2], split(peering.remoteVirtualNetworkId, '/')[4]) params: { diff --git a/modules/network/virtual-networks/main.json b/modules/network/virtual-network/main.json similarity index 100% rename from modules/network/virtual-networks/main.json rename to modules/network/virtual-network/main.json diff --git a/modules/network/virtual-networks/subnets/.bicep/nested_roleAssignments.bicep b/modules/network/virtual-network/subnets/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/virtual-networks/subnets/.bicep/nested_roleAssignments.bicep rename to modules/network/virtual-network/subnets/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/virtual-networks/subnets/README.md b/modules/network/virtual-network/subnets/README.md similarity index 100% rename from modules/network/virtual-networks/subnets/README.md rename to modules/network/virtual-network/subnets/README.md diff --git a/modules/network/virtual-networks/subnets/main.bicep b/modules/network/virtual-network/subnets/main.bicep similarity index 100% rename from modules/network/virtual-networks/subnets/main.bicep rename to modules/network/virtual-network/subnets/main.bicep diff --git a/modules/network/virtual-networks/subnets/main.json b/modules/network/virtual-network/subnets/main.json similarity index 100% rename from modules/network/virtual-networks/subnets/main.json rename to modules/network/virtual-network/subnets/main.json diff --git a/modules/network/virtual-networks/subnets/version.json b/modules/network/virtual-network/subnets/version.json similarity index 100% rename from modules/network/virtual-networks/subnets/version.json rename to modules/network/virtual-network/subnets/version.json diff --git a/modules/network/virtual-networks/version.json b/modules/network/virtual-network/version.json similarity index 100% rename from modules/network/virtual-networks/version.json rename to modules/network/virtual-network/version.json diff --git a/modules/network/virtual-networks/virtual-network-peerings/README.md b/modules/network/virtual-network/virtual-network-peerings/README.md similarity index 100% rename from modules/network/virtual-networks/virtual-network-peerings/README.md rename to modules/network/virtual-network/virtual-network-peerings/README.md diff --git a/modules/network/virtual-networks/virtual-network-peerings/main.bicep b/modules/network/virtual-network/virtual-network-peerings/main.bicep similarity index 100% rename from modules/network/virtual-networks/virtual-network-peerings/main.bicep rename to modules/network/virtual-network/virtual-network-peerings/main.bicep diff --git a/modules/network/virtual-networks/virtual-network-peerings/main.json b/modules/network/virtual-network/virtual-network-peerings/main.json similarity index 100% rename from modules/network/virtual-networks/virtual-network-peerings/main.json rename to modules/network/virtual-network/virtual-network-peerings/main.json diff --git a/modules/network/virtual-networks/virtual-network-peerings/version.json b/modules/network/virtual-network/virtual-network-peerings/version.json similarity index 100% rename from modules/network/virtual-networks/virtual-network-peerings/version.json rename to modules/network/virtual-network/virtual-network-peerings/version.json diff --git a/modules/network/virtual-wans/.bicep/nested_roleAssignments.bicep b/modules/network/virtual-wan/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/virtual-wans/.bicep/nested_roleAssignments.bicep rename to modules/network/virtual-wan/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/virtual-wans/.test/common/dependencies.bicep b/modules/network/virtual-wan/.test/common/dependencies.bicep similarity index 100% rename from modules/network/virtual-wans/.test/common/dependencies.bicep rename to modules/network/virtual-wan/.test/common/dependencies.bicep diff --git a/modules/network/virtual-wans/.test/common/main.test.bicep b/modules/network/virtual-wan/.test/common/main.test.bicep similarity index 100% rename from modules/network/virtual-wans/.test/common/main.test.bicep rename to modules/network/virtual-wan/.test/common/main.test.bicep diff --git a/modules/network/virtual-wans/.test/main.test.bicep b/modules/network/virtual-wan/.test/main.test.bicep similarity index 100% rename from modules/network/virtual-wans/.test/main.test.bicep rename to modules/network/virtual-wan/.test/main.test.bicep diff --git a/modules/network/virtual-wans/.test/min/main.test.bicep b/modules/network/virtual-wan/.test/min/main.test.bicep similarity index 100% rename from modules/network/virtual-wans/.test/min/main.test.bicep rename to modules/network/virtual-wan/.test/min/main.test.bicep diff --git a/modules/network/virtual-wans/README.md b/modules/network/virtual-wan/README.md similarity index 98% rename from modules/network/virtual-wans/README.md rename to modules/network/virtual-wan/README.md index 6aabbd51b1..d47fa76072 100644 --- a/modules/network/virtual-wans/README.md +++ b/modules/network/virtual-wan/README.md @@ -168,7 +168,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module virtualWans './network/virtual-wans/main.bicep' = { +module virtualWans './network/virtual-wan/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nvwcom' params: { // Required parameters @@ -263,7 +263,7 @@ module virtualWans './network/virtual-wans/main.bicep' = { via Bicep module ```bicep -module virtualWans './network/virtual-wans/main.bicep' = { +module virtualWans './network/virtual-wan/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nvwmin' params: { // Required parameters diff --git a/modules/network/virtual-wans/main.bicep b/modules/network/virtual-wan/main.bicep similarity index 100% rename from modules/network/virtual-wans/main.bicep rename to modules/network/virtual-wan/main.bicep diff --git a/modules/network/virtual-wans/main.json b/modules/network/virtual-wan/main.json similarity index 100% rename from modules/network/virtual-wans/main.json rename to modules/network/virtual-wan/main.json diff --git a/modules/network/virtual-wans/version.json b/modules/network/virtual-wan/version.json similarity index 100% rename from modules/network/virtual-wans/version.json rename to modules/network/virtual-wan/version.json diff --git a/modules/network/vpn-gateways/.test/common/dependencies.bicep b/modules/network/vpn-gateway/.test/common/dependencies.bicep similarity index 100% rename from modules/network/vpn-gateways/.test/common/dependencies.bicep rename to modules/network/vpn-gateway/.test/common/dependencies.bicep diff --git a/modules/network/vpn-gateways/.test/common/main.test.bicep b/modules/network/vpn-gateway/.test/common/main.test.bicep similarity index 100% rename from modules/network/vpn-gateways/.test/common/main.test.bicep rename to modules/network/vpn-gateway/.test/common/main.test.bicep diff --git a/modules/network/vpn-gateways/.test/main.test.bicep b/modules/network/vpn-gateway/.test/main.test.bicep similarity index 100% rename from modules/network/vpn-gateways/.test/main.test.bicep rename to modules/network/vpn-gateway/.test/main.test.bicep diff --git a/modules/network/vpn-gateways/.test/min/dependencies.bicep b/modules/network/vpn-gateway/.test/min/dependencies.bicep similarity index 100% rename from modules/network/vpn-gateways/.test/min/dependencies.bicep rename to modules/network/vpn-gateway/.test/min/dependencies.bicep diff --git a/modules/network/vpn-gateways/.test/min/main.test.bicep b/modules/network/vpn-gateway/.test/min/main.test.bicep similarity index 100% rename from modules/network/vpn-gateways/.test/min/main.test.bicep rename to modules/network/vpn-gateway/.test/min/main.test.bicep diff --git a/modules/network/vpn-gateways/README.md b/modules/network/vpn-gateway/README.md similarity index 98% rename from modules/network/vpn-gateways/README.md rename to modules/network/vpn-gateway/README.md index 69e332daaf..df079b1d61 100644 --- a/modules/network/vpn-gateways/README.md +++ b/modules/network/vpn-gateway/README.md @@ -189,7 +189,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module vpnGateways './network/vpn-gateways/main.bicep' = { +module vpnGateways './network/vpn-gateway/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nvgcom' params: { // Required parameters @@ -328,7 +328,7 @@ module vpnGateways './network/vpn-gateways/main.bicep' = { via Bicep module ```bicep -module vpnGateways './network/vpn-gateways/main.bicep' = { +module vpnGateways './network/vpn-gateway/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nvgmin' params: { // Required parameters diff --git a/modules/network/vpn-gateways/main.bicep b/modules/network/vpn-gateway/main.bicep similarity index 98% rename from modules/network/vpn-gateways/main.bicep rename to modules/network/vpn-gateway/main.bicep index 3b0572fb76..8872675c18 100644 --- a/modules/network/vpn-gateways/main.bicep +++ b/modules/network/vpn-gateway/main.bicep @@ -81,7 +81,7 @@ resource vpnGateway_lock 'Microsoft.Authorization/locks@2020-05-01' = if (!empty scope: vpnGateway } -module vpnGateway_natRules 'nat-rules/main.bicep' = [for (natRule, index) in natRules: { +module vpnGateway_natRules 'nat-rule/main.bicep' = [for (natRule, index) in natRules: { name: '${deployment().name}-NATRule-${index}' params: { name: natRule.name diff --git a/modules/network/vpn-gateways/main.json b/modules/network/vpn-gateway/main.json similarity index 100% rename from modules/network/vpn-gateways/main.json rename to modules/network/vpn-gateway/main.json diff --git a/modules/network/vpn-gateways/nat-rules/README.md b/modules/network/vpn-gateway/nat-rules/README.md similarity index 100% rename from modules/network/vpn-gateways/nat-rules/README.md rename to modules/network/vpn-gateway/nat-rules/README.md diff --git a/modules/network/vpn-gateways/nat-rules/main.bicep b/modules/network/vpn-gateway/nat-rules/main.bicep similarity index 100% rename from modules/network/vpn-gateways/nat-rules/main.bicep rename to modules/network/vpn-gateway/nat-rules/main.bicep diff --git a/modules/network/vpn-gateways/nat-rules/main.json b/modules/network/vpn-gateway/nat-rules/main.json similarity index 100% rename from modules/network/vpn-gateways/nat-rules/main.json rename to modules/network/vpn-gateway/nat-rules/main.json diff --git a/modules/network/vpn-gateways/nat-rules/version.json b/modules/network/vpn-gateway/nat-rules/version.json similarity index 100% rename from modules/network/vpn-gateways/nat-rules/version.json rename to modules/network/vpn-gateway/nat-rules/version.json diff --git a/modules/network/vpn-gateways/version.json b/modules/network/vpn-gateway/version.json similarity index 100% rename from modules/network/vpn-gateways/version.json rename to modules/network/vpn-gateway/version.json diff --git a/modules/network/vpn-gateways/vpn-connections/README.md b/modules/network/vpn-gateway/vpn-connections/README.md similarity index 100% rename from modules/network/vpn-gateways/vpn-connections/README.md rename to modules/network/vpn-gateway/vpn-connections/README.md diff --git a/modules/network/vpn-gateways/vpn-connections/main.bicep b/modules/network/vpn-gateway/vpn-connections/main.bicep similarity index 100% rename from modules/network/vpn-gateways/vpn-connections/main.bicep rename to modules/network/vpn-gateway/vpn-connections/main.bicep diff --git a/modules/network/vpn-gateways/vpn-connections/main.json b/modules/network/vpn-gateway/vpn-connections/main.json similarity index 100% rename from modules/network/vpn-gateways/vpn-connections/main.json rename to modules/network/vpn-gateway/vpn-connections/main.json diff --git a/modules/network/vpn-gateways/vpn-connections/version.json b/modules/network/vpn-gateway/vpn-connections/version.json similarity index 100% rename from modules/network/vpn-gateways/vpn-connections/version.json rename to modules/network/vpn-gateway/vpn-connections/version.json diff --git a/modules/network/vpn-sites/.bicep/nested_roleAssignments.bicep b/modules/network/vpn-site/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/vpn-sites/.bicep/nested_roleAssignments.bicep rename to modules/network/vpn-site/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/vpn-sites/.test/common/dependencies.bicep b/modules/network/vpn-site/.test/common/dependencies.bicep similarity index 100% rename from modules/network/vpn-sites/.test/common/dependencies.bicep rename to modules/network/vpn-site/.test/common/dependencies.bicep diff --git a/modules/network/vpn-sites/.test/common/main.test.bicep b/modules/network/vpn-site/.test/common/main.test.bicep similarity index 100% rename from modules/network/vpn-sites/.test/common/main.test.bicep rename to modules/network/vpn-site/.test/common/main.test.bicep diff --git a/modules/network/vpn-sites/.test/main.test.bicep b/modules/network/vpn-site/.test/main.test.bicep similarity index 100% rename from modules/network/vpn-sites/.test/main.test.bicep rename to modules/network/vpn-site/.test/main.test.bicep diff --git a/modules/network/vpn-sites/.test/min/dependencies.bicep b/modules/network/vpn-site/.test/min/dependencies.bicep similarity index 100% rename from modules/network/vpn-sites/.test/min/dependencies.bicep rename to modules/network/vpn-site/.test/min/dependencies.bicep diff --git a/modules/network/vpn-sites/.test/min/main.test.bicep b/modules/network/vpn-site/.test/min/main.test.bicep similarity index 100% rename from modules/network/vpn-sites/.test/min/main.test.bicep rename to modules/network/vpn-site/.test/min/main.test.bicep diff --git a/modules/network/vpn-sites/README.md b/modules/network/vpn-site/README.md similarity index 99% rename from modules/network/vpn-sites/README.md rename to modules/network/vpn-site/README.md index f89e98df78..4256a3f85c 100644 --- a/modules/network/vpn-sites/README.md +++ b/modules/network/vpn-site/README.md @@ -342,7 +342,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module vpnSites './network/vpn-sites/main.bicep' = { +module vpnSites './network/vpn-site/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nvscom' params: { // Required parameters @@ -511,7 +511,7 @@ module vpnSites './network/vpn-sites/main.bicep' = { via Bicep module ```bicep -module vpnSites './network/vpn-sites/main.bicep' = { +module vpnSites './network/vpn-site/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-nvsmin' params: { // Required parameters diff --git a/modules/network/vpn-sites/main.bicep b/modules/network/vpn-site/main.bicep similarity index 100% rename from modules/network/vpn-sites/main.bicep rename to modules/network/vpn-site/main.bicep diff --git a/modules/network/vpn-sites/main.json b/modules/network/vpn-site/main.json similarity index 100% rename from modules/network/vpn-sites/main.json rename to modules/network/vpn-site/main.json diff --git a/modules/network/vpn-sites/version.json b/modules/network/vpn-site/version.json similarity index 100% rename from modules/network/vpn-sites/version.json rename to modules/network/vpn-site/version.json diff --git a/modules/operational-insights/workspaces/.bicep/nested_roleAssignments.bicep b/modules/operational-insights/workspace/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/operational-insights/workspaces/.bicep/nested_roleAssignments.bicep rename to modules/operational-insights/workspace/.bicep/nested_roleAssignments.bicep diff --git a/modules/operational-insights/workspaces/.test/adv/dependencies.bicep b/modules/operational-insights/workspace/.test/adv/dependencies.bicep similarity index 100% rename from modules/operational-insights/workspaces/.test/adv/dependencies.bicep rename to modules/operational-insights/workspace/.test/adv/dependencies.bicep diff --git a/modules/operational-insights/workspaces/.test/adv/main.test.bicep b/modules/operational-insights/workspace/.test/adv/main.test.bicep similarity index 100% rename from modules/operational-insights/workspaces/.test/adv/main.test.bicep rename to modules/operational-insights/workspace/.test/adv/main.test.bicep diff --git a/modules/operational-insights/workspaces/.test/common/dependencies.bicep b/modules/operational-insights/workspace/.test/common/dependencies.bicep similarity index 100% rename from modules/operational-insights/workspaces/.test/common/dependencies.bicep rename to modules/operational-insights/workspace/.test/common/dependencies.bicep diff --git a/modules/operational-insights/workspaces/.test/common/main.test.bicep b/modules/operational-insights/workspace/.test/common/main.test.bicep similarity index 100% rename from modules/operational-insights/workspaces/.test/common/main.test.bicep rename to modules/operational-insights/workspace/.test/common/main.test.bicep diff --git a/modules/operational-insights/workspaces/.test/main.test.bicep b/modules/operational-insights/workspace/.test/main.test.bicep similarity index 100% rename from modules/operational-insights/workspaces/.test/main.test.bicep rename to modules/operational-insights/workspace/.test/main.test.bicep diff --git a/modules/operational-insights/workspaces/.test/min/main.test.bicep b/modules/operational-insights/workspace/.test/min/main.test.bicep similarity index 100% rename from modules/operational-insights/workspaces/.test/min/main.test.bicep rename to modules/operational-insights/workspace/.test/min/main.test.bicep diff --git a/modules/operational-insights/workspaces/README.md b/modules/operational-insights/workspace/README.md similarity index 99% rename from modules/operational-insights/workspaces/README.md rename to modules/operational-insights/workspace/README.md index 63bf9869bb..4050f8cc46 100644 --- a/modules/operational-insights/workspaces/README.md +++ b/modules/operational-insights/workspace/README.md @@ -512,7 +512,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module workspaces './operational-insights/workspaces/main.bicep' = { +module workspaces './operational-insights/workspace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-oiwadv' params: { // Required parameters @@ -1043,7 +1043,7 @@ module workspaces './operational-insights/workspaces/main.bicep' = { via Bicep module ```bicep -module workspaces './operational-insights/workspaces/main.bicep' = { +module workspaces './operational-insights/workspace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-oiwcom' params: { // Required parameters @@ -1430,7 +1430,7 @@ module workspaces './operational-insights/workspaces/main.bicep' = { via Bicep module ```bicep -module workspaces './operational-insights/workspaces/main.bicep' = { +module workspaces './operational-insights/workspace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-oiwmin' params: { // Required parameters diff --git a/modules/operational-insights/workspaces/data-exports/README.md b/modules/operational-insights/workspace/data-exports/README.md similarity index 100% rename from modules/operational-insights/workspaces/data-exports/README.md rename to modules/operational-insights/workspace/data-exports/README.md diff --git a/modules/operational-insights/workspaces/data-exports/main.bicep b/modules/operational-insights/workspace/data-exports/main.bicep similarity index 100% rename from modules/operational-insights/workspaces/data-exports/main.bicep rename to modules/operational-insights/workspace/data-exports/main.bicep diff --git a/modules/operational-insights/workspaces/data-exports/main.json b/modules/operational-insights/workspace/data-exports/main.json similarity index 100% rename from modules/operational-insights/workspaces/data-exports/main.json rename to modules/operational-insights/workspace/data-exports/main.json diff --git a/modules/operational-insights/workspaces/data-exports/version.json b/modules/operational-insights/workspace/data-exports/version.json similarity index 100% rename from modules/operational-insights/workspaces/data-exports/version.json rename to modules/operational-insights/workspace/data-exports/version.json diff --git a/modules/operational-insights/workspaces/data-sources/README.md b/modules/operational-insights/workspace/data-sources/README.md similarity index 100% rename from modules/operational-insights/workspaces/data-sources/README.md rename to modules/operational-insights/workspace/data-sources/README.md diff --git a/modules/operational-insights/workspaces/data-sources/main.bicep b/modules/operational-insights/workspace/data-sources/main.bicep similarity index 100% rename from modules/operational-insights/workspaces/data-sources/main.bicep rename to modules/operational-insights/workspace/data-sources/main.bicep diff --git a/modules/operational-insights/workspaces/data-sources/main.json b/modules/operational-insights/workspace/data-sources/main.json similarity index 100% rename from modules/operational-insights/workspaces/data-sources/main.json rename to modules/operational-insights/workspace/data-sources/main.json diff --git a/modules/operational-insights/workspaces/data-sources/version.json b/modules/operational-insights/workspace/data-sources/version.json similarity index 100% rename from modules/operational-insights/workspaces/data-sources/version.json rename to modules/operational-insights/workspace/data-sources/version.json diff --git a/modules/operational-insights/workspaces/linked-services/README.md b/modules/operational-insights/workspace/linked-services/README.md similarity index 100% rename from modules/operational-insights/workspaces/linked-services/README.md rename to modules/operational-insights/workspace/linked-services/README.md diff --git a/modules/operational-insights/workspaces/linked-services/main.bicep b/modules/operational-insights/workspace/linked-services/main.bicep similarity index 100% rename from modules/operational-insights/workspaces/linked-services/main.bicep rename to modules/operational-insights/workspace/linked-services/main.bicep diff --git a/modules/operational-insights/workspaces/linked-services/main.json b/modules/operational-insights/workspace/linked-services/main.json similarity index 100% rename from modules/operational-insights/workspaces/linked-services/main.json rename to modules/operational-insights/workspace/linked-services/main.json diff --git a/modules/operational-insights/workspaces/linked-services/version.json b/modules/operational-insights/workspace/linked-services/version.json similarity index 100% rename from modules/operational-insights/workspaces/linked-services/version.json rename to modules/operational-insights/workspace/linked-services/version.json diff --git a/modules/operational-insights/workspaces/linked-storage-accounts/README.md b/modules/operational-insights/workspace/linked-storage-accounts/README.md similarity index 100% rename from modules/operational-insights/workspaces/linked-storage-accounts/README.md rename to modules/operational-insights/workspace/linked-storage-accounts/README.md diff --git a/modules/operational-insights/workspaces/linked-storage-accounts/main.bicep b/modules/operational-insights/workspace/linked-storage-accounts/main.bicep similarity index 100% rename from modules/operational-insights/workspaces/linked-storage-accounts/main.bicep rename to modules/operational-insights/workspace/linked-storage-accounts/main.bicep diff --git a/modules/operational-insights/workspaces/linked-storage-accounts/main.json b/modules/operational-insights/workspace/linked-storage-accounts/main.json similarity index 100% rename from modules/operational-insights/workspaces/linked-storage-accounts/main.json rename to modules/operational-insights/workspace/linked-storage-accounts/main.json diff --git a/modules/operational-insights/workspaces/linked-storage-accounts/version.json b/modules/operational-insights/workspace/linked-storage-accounts/version.json similarity index 100% rename from modules/operational-insights/workspaces/linked-storage-accounts/version.json rename to modules/operational-insights/workspace/linked-storage-accounts/version.json diff --git a/modules/operational-insights/workspaces/main.bicep b/modules/operational-insights/workspace/main.bicep similarity index 94% rename from modules/operational-insights/workspaces/main.bicep rename to modules/operational-insights/workspace/main.bicep index aa75a16841..43c7763bc4 100644 --- a/modules/operational-insights/workspaces/main.bicep +++ b/modules/operational-insights/workspace/main.bicep @@ -230,7 +230,7 @@ resource logAnalyticsWorkspace_diagnosticSettings 'Microsoft.Insights/diagnostic scope: logAnalyticsWorkspace } -module logAnalyticsWorkspace_storageInsightConfigs 'storage-insight-configs/main.bicep' = [for (storageInsightsConfig, index) in storageInsightsConfigs: { +module logAnalyticsWorkspace_storageInsightConfigs 'storage-insight-config/main.bicep' = [for (storageInsightsConfig, index) in storageInsightsConfigs: { name: '${uniqueString(deployment().name, location)}-LAW-StorageInsightsConfig-${index}' params: { logAnalyticsWorkspaceName: logAnalyticsWorkspace.name @@ -241,7 +241,7 @@ module logAnalyticsWorkspace_storageInsightConfigs 'storage-insight-configs/main } }] -module logAnalyticsWorkspace_linkedServices 'linked-services/main.bicep' = [for (linkedService, index) in linkedServices: { +module logAnalyticsWorkspace_linkedServices 'linked-service/main.bicep' = [for (linkedService, index) in linkedServices: { name: '${uniqueString(deployment().name, location)}-LAW-LinkedService-${index}' params: { logAnalyticsWorkspaceName: logAnalyticsWorkspace.name @@ -252,7 +252,7 @@ module logAnalyticsWorkspace_linkedServices 'linked-services/main.bicep' = [for } }] -module logAnalyticsWorkspace_linkedStorageAccounts 'linked-storage-accounts/main.bicep' = [for (linkedStorageAccount, index) in linkedStorageAccounts: { +module logAnalyticsWorkspace_linkedStorageAccounts 'linked-storage-account/main.bicep' = [for (linkedStorageAccount, index) in linkedStorageAccounts: { name: '${uniqueString(deployment().name, location)}-LAW-LinkedStorageAccount-${index}' params: { logAnalyticsWorkspaceName: logAnalyticsWorkspace.name @@ -262,7 +262,7 @@ module logAnalyticsWorkspace_linkedStorageAccounts 'linked-storage-accounts/main } }] -module logAnalyticsWorkspace_savedSearches 'saved-searches/main.bicep' = [for (savedSearch, index) in savedSearches: { +module logAnalyticsWorkspace_savedSearches 'saved-searche/main.bicep' = [for (savedSearch, index) in savedSearches: { name: '${uniqueString(deployment().name, location)}-LAW-SavedSearch-${index}' params: { logAnalyticsWorkspaceName: logAnalyticsWorkspace.name @@ -281,7 +281,7 @@ module logAnalyticsWorkspace_savedSearches 'saved-searches/main.bicep' = [for (s ] }] -module logAnalyticsWorkspace_dataExports 'data-exports/main.bicep' = [for (dataExport, index) in dataExports: { +module logAnalyticsWorkspace_dataExports 'data-export/main.bicep' = [for (dataExport, index) in dataExports: { name: '${uniqueString(deployment().name, location)}-LAW-DataExport-${index}' params: { workspaceName: logAnalyticsWorkspace.name @@ -293,7 +293,7 @@ module logAnalyticsWorkspace_dataExports 'data-exports/main.bicep' = [for (dataE } }] -module logAnalyticsWorkspace_dataSources 'data-sources/main.bicep' = [for (dataSource, index) in dataSources: { +module logAnalyticsWorkspace_dataSources 'data-source/main.bicep' = [for (dataSource, index) in dataSources: { name: '${uniqueString(deployment().name, location)}-LAW-DataSource-${index}' params: { logAnalyticsWorkspaceName: logAnalyticsWorkspace.name @@ -314,7 +314,7 @@ module logAnalyticsWorkspace_dataSources 'data-sources/main.bicep' = [for (dataS } }] -module logAnalyticsWorkspace_tables 'tables/main.bicep' = [for (table, index) in tables: { +module logAnalyticsWorkspace_tables 'table/main.bicep' = [for (table, index) in tables: { name: '${uniqueString(deployment().name, location)}-LAW-Table-${index}' params: { workspaceName: logAnalyticsWorkspace.name @@ -329,7 +329,7 @@ module logAnalyticsWorkspace_tables 'tables/main.bicep' = [for (table, index) in } }] -module logAnalyticsWorkspace_solutions '../../operations-management/solutions/main.bicep' = [for (gallerySolution, index) in gallerySolutions: if (!empty(gallerySolutions)) { +module logAnalyticsWorkspace_solutions '../../operations-management/solution/main.bicep' = [for (gallerySolution, index) in gallerySolutions: if (!empty(gallerySolutions)) { name: '${uniqueString(deployment().name, location)}-LAW-Solution-${index}' params: { name: gallerySolution.name diff --git a/modules/operational-insights/workspaces/main.json b/modules/operational-insights/workspace/main.json similarity index 100% rename from modules/operational-insights/workspaces/main.json rename to modules/operational-insights/workspace/main.json diff --git a/modules/operational-insights/workspaces/saved-searches/README.md b/modules/operational-insights/workspace/saved-searches/README.md similarity index 100% rename from modules/operational-insights/workspaces/saved-searches/README.md rename to modules/operational-insights/workspace/saved-searches/README.md diff --git a/modules/operational-insights/workspaces/saved-searches/main.bicep b/modules/operational-insights/workspace/saved-searches/main.bicep similarity index 100% rename from modules/operational-insights/workspaces/saved-searches/main.bicep rename to modules/operational-insights/workspace/saved-searches/main.bicep diff --git a/modules/operational-insights/workspaces/saved-searches/main.json b/modules/operational-insights/workspace/saved-searches/main.json similarity index 100% rename from modules/operational-insights/workspaces/saved-searches/main.json rename to modules/operational-insights/workspace/saved-searches/main.json diff --git a/modules/operational-insights/workspaces/saved-searches/version.json b/modules/operational-insights/workspace/saved-searches/version.json similarity index 100% rename from modules/operational-insights/workspaces/saved-searches/version.json rename to modules/operational-insights/workspace/saved-searches/version.json diff --git a/modules/operational-insights/workspaces/storage-insight-configs/README.md b/modules/operational-insights/workspace/storage-insight-configs/README.md similarity index 100% rename from modules/operational-insights/workspaces/storage-insight-configs/README.md rename to modules/operational-insights/workspace/storage-insight-configs/README.md diff --git a/modules/operational-insights/workspaces/storage-insight-configs/main.bicep b/modules/operational-insights/workspace/storage-insight-configs/main.bicep similarity index 100% rename from modules/operational-insights/workspaces/storage-insight-configs/main.bicep rename to modules/operational-insights/workspace/storage-insight-configs/main.bicep diff --git a/modules/operational-insights/workspaces/storage-insight-configs/main.json b/modules/operational-insights/workspace/storage-insight-configs/main.json similarity index 100% rename from modules/operational-insights/workspaces/storage-insight-configs/main.json rename to modules/operational-insights/workspace/storage-insight-configs/main.json diff --git a/modules/operational-insights/workspaces/storage-insight-configs/version.json b/modules/operational-insights/workspace/storage-insight-configs/version.json similarity index 100% rename from modules/operational-insights/workspaces/storage-insight-configs/version.json rename to modules/operational-insights/workspace/storage-insight-configs/version.json diff --git a/modules/operational-insights/workspaces/tables/README.md b/modules/operational-insights/workspace/tables/README.md similarity index 100% rename from modules/operational-insights/workspaces/tables/README.md rename to modules/operational-insights/workspace/tables/README.md diff --git a/modules/operational-insights/workspaces/tables/main.bicep b/modules/operational-insights/workspace/tables/main.bicep similarity index 100% rename from modules/operational-insights/workspaces/tables/main.bicep rename to modules/operational-insights/workspace/tables/main.bicep diff --git a/modules/operational-insights/workspaces/tables/main.json b/modules/operational-insights/workspace/tables/main.json similarity index 100% rename from modules/operational-insights/workspaces/tables/main.json rename to modules/operational-insights/workspace/tables/main.json diff --git a/modules/operational-insights/workspaces/tables/version.json b/modules/operational-insights/workspace/tables/version.json similarity index 100% rename from modules/operational-insights/workspaces/tables/version.json rename to modules/operational-insights/workspace/tables/version.json diff --git a/modules/operational-insights/workspaces/version.json b/modules/operational-insights/workspace/version.json similarity index 100% rename from modules/operational-insights/workspaces/version.json rename to modules/operational-insights/workspace/version.json diff --git a/modules/operations-management/solutions/.test/main.test.bicep b/modules/operations-management/solution/.test/main.test.bicep similarity index 100% rename from modules/operations-management/solutions/.test/main.test.bicep rename to modules/operations-management/solution/.test/main.test.bicep diff --git a/modules/operations-management/solutions/.test/min/dependencies.bicep b/modules/operations-management/solution/.test/min/dependencies.bicep similarity index 100% rename from modules/operations-management/solutions/.test/min/dependencies.bicep rename to modules/operations-management/solution/.test/min/dependencies.bicep diff --git a/modules/operations-management/solutions/.test/min/main.test.bicep b/modules/operations-management/solution/.test/min/main.test.bicep similarity index 100% rename from modules/operations-management/solutions/.test/min/main.test.bicep rename to modules/operations-management/solution/.test/min/main.test.bicep diff --git a/modules/operations-management/solutions/.test/ms/dependencies.bicep b/modules/operations-management/solution/.test/ms/dependencies.bicep similarity index 100% rename from modules/operations-management/solutions/.test/ms/dependencies.bicep rename to modules/operations-management/solution/.test/ms/dependencies.bicep diff --git a/modules/operations-management/solutions/.test/ms/main.test.bicep b/modules/operations-management/solution/.test/ms/main.test.bicep similarity index 100% rename from modules/operations-management/solutions/.test/ms/main.test.bicep rename to modules/operations-management/solution/.test/ms/main.test.bicep diff --git a/modules/operations-management/solutions/.test/nonms/dependencies.bicep b/modules/operations-management/solution/.test/nonms/dependencies.bicep similarity index 100% rename from modules/operations-management/solutions/.test/nonms/dependencies.bicep rename to modules/operations-management/solution/.test/nonms/dependencies.bicep diff --git a/modules/operations-management/solutions/.test/nonms/main.test.bicep b/modules/operations-management/solution/.test/nonms/main.test.bicep similarity index 100% rename from modules/operations-management/solutions/.test/nonms/main.test.bicep rename to modules/operations-management/solution/.test/nonms/main.test.bicep diff --git a/modules/operations-management/solutions/README.md b/modules/operations-management/solution/README.md similarity index 96% rename from modules/operations-management/solutions/README.md rename to modules/operations-management/solution/README.md index cb5e566e94..b73ab544c5 100644 --- a/modules/operations-management/solutions/README.md +++ b/modules/operations-management/solution/README.md @@ -62,7 +62,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module solutions './operations-management/solutions/main.bicep' = { +module solutions './operations-management/solution/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-omsmin' params: { // Required parameters @@ -111,7 +111,7 @@ module solutions './operations-management/solutions/main.bicep' = { via Bicep module ```bicep -module solutions './operations-management/solutions/main.bicep' = { +module solutions './operations-management/solution/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-omsms' params: { // Required parameters @@ -168,7 +168,7 @@ module solutions './operations-management/solutions/main.bicep' = { via Bicep module ```bicep -module solutions './operations-management/solutions/main.bicep' = { +module solutions './operations-management/solution/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-omsnonms' params: { // Required parameters diff --git a/modules/operations-management/solutions/main.bicep b/modules/operations-management/solution/main.bicep similarity index 100% rename from modules/operations-management/solutions/main.bicep rename to modules/operations-management/solution/main.bicep diff --git a/modules/operations-management/solutions/main.json b/modules/operations-management/solution/main.json similarity index 100% rename from modules/operations-management/solutions/main.json rename to modules/operations-management/solution/main.json diff --git a/modules/operations-management/solutions/version.json b/modules/operations-management/solution/version.json similarity index 100% rename from modules/operations-management/solutions/version.json rename to modules/operations-management/solution/version.json diff --git a/modules/policy-insights/remediations/.test/main.test.bicep b/modules/policy-insights/remediation/.test/main.test.bicep similarity index 100% rename from modules/policy-insights/remediations/.test/main.test.bicep rename to modules/policy-insights/remediation/.test/main.test.bicep diff --git a/modules/policy-insights/remediations/.test/mg.common/main.test.bicep b/modules/policy-insights/remediation/.test/mg.common/main.test.bicep similarity index 100% rename from modules/policy-insights/remediations/.test/mg.common/main.test.bicep rename to modules/policy-insights/remediation/.test/mg.common/main.test.bicep diff --git a/modules/policy-insights/remediations/.test/mg.min/main.test.bicep b/modules/policy-insights/remediation/.test/mg.min/main.test.bicep similarity index 100% rename from modules/policy-insights/remediations/.test/mg.min/main.test.bicep rename to modules/policy-insights/remediation/.test/mg.min/main.test.bicep diff --git a/modules/policy-insights/remediations/.test/rg.common/main.test.bicep b/modules/policy-insights/remediation/.test/rg.common/main.test.bicep similarity index 100% rename from modules/policy-insights/remediations/.test/rg.common/main.test.bicep rename to modules/policy-insights/remediation/.test/rg.common/main.test.bicep diff --git a/modules/policy-insights/remediations/.test/rg.min/main.test.bicep b/modules/policy-insights/remediation/.test/rg.min/main.test.bicep similarity index 100% rename from modules/policy-insights/remediations/.test/rg.min/main.test.bicep rename to modules/policy-insights/remediation/.test/rg.min/main.test.bicep diff --git a/modules/policy-insights/remediations/.test/sub.common/main.test.bicep b/modules/policy-insights/remediation/.test/sub.common/main.test.bicep similarity index 100% rename from modules/policy-insights/remediations/.test/sub.common/main.test.bicep rename to modules/policy-insights/remediation/.test/sub.common/main.test.bicep diff --git a/modules/policy-insights/remediations/.test/sub.min/main.test.bicep b/modules/policy-insights/remediation/.test/sub.min/main.test.bicep similarity index 100% rename from modules/policy-insights/remediations/.test/sub.min/main.test.bicep rename to modules/policy-insights/remediation/.test/sub.min/main.test.bicep diff --git a/modules/policy-insights/remediations/README.md b/modules/policy-insights/remediation/README.md similarity index 96% rename from modules/policy-insights/remediations/README.md rename to modules/policy-insights/remediation/README.md index 1f3a4dffae..8613748593 100644 --- a/modules/policy-insights/remediations/README.md +++ b/modules/policy-insights/remediation/README.md @@ -152,7 +152,7 @@ module remediation 'br:bicepregistry.azurecr.io/bicep/modules/policyinsights.rem ``` **Local Path Reference** ```bicep -module remediation 'yourpath/modules/Authorization.policyinsights/subscription/main.bicep' = {} +module remediation 'yourpath/module/Authorization.policyinsights/subscription/main.bicep' = {} ## Outputs @@ -180,7 +180,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module remediations './policy-insights/remediations/main.bicep' = { +module remediations './policy-insights/remediation/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-pirmgcom' params: { // Required parameters @@ -261,7 +261,7 @@ module remediations './policy-insights/remediations/main.bicep' = { via Bicep module ```bicep -module remediations './policy-insights/remediations/main.bicep' = { +module remediations './policy-insights/remediation/main.bicep' = { name: '${uniqueString(deployment().name)}-test-pirmgmin' params: { // Required parameters @@ -310,7 +310,7 @@ module remediations './policy-insights/remediations/main.bicep' = { via Bicep module ```bicep -module remediations './policy-insights/remediations/main.bicep' = { +module remediations './policy-insights/remediation/main.bicep' = { name: '${uniqueString(deployment().name)}-test-pirrgcom' params: { // Required parameters @@ -391,7 +391,7 @@ module remediations './policy-insights/remediations/main.bicep' = { via Bicep module ```bicep -module remediations './policy-insights/remediations/main.bicep' = { +module remediations './policy-insights/remediation/main.bicep' = { name: '${uniqueString(deployment().name)}-test-pirrgmin' params: { // Required parameters @@ -440,7 +440,7 @@ module remediations './policy-insights/remediations/main.bicep' = { via Bicep module ```bicep -module remediations './policy-insights/remediations/main.bicep' = { +module remediations './policy-insights/remediation/main.bicep' = { name: '${uniqueString(deployment().name)}-test-pirsubcom' params: { // Required parameters @@ -521,7 +521,7 @@ module remediations './policy-insights/remediations/main.bicep' = { via Bicep module ```bicep -module remediations './policy-insights/remediations/main.bicep' = { +module remediations './policy-insights/remediation/main.bicep' = { name: '${uniqueString(deployment().name)}-test-pirsubmin' params: { // Required parameters diff --git a/modules/policy-insights/remediations/main.bicep b/modules/policy-insights/remediation/main.bicep similarity index 100% rename from modules/policy-insights/remediations/main.bicep rename to modules/policy-insights/remediation/main.bicep diff --git a/modules/policy-insights/remediations/main.json b/modules/policy-insights/remediation/main.json similarity index 100% rename from modules/policy-insights/remediations/main.json rename to modules/policy-insights/remediation/main.json diff --git a/modules/policy-insights/remediations/management-group/README.md b/modules/policy-insights/remediation/management-group/README.md similarity index 100% rename from modules/policy-insights/remediations/management-group/README.md rename to modules/policy-insights/remediation/management-group/README.md diff --git a/modules/policy-insights/remediations/management-group/main.bicep b/modules/policy-insights/remediation/management-group/main.bicep similarity index 100% rename from modules/policy-insights/remediations/management-group/main.bicep rename to modules/policy-insights/remediation/management-group/main.bicep diff --git a/modules/policy-insights/remediations/management-group/main.json b/modules/policy-insights/remediation/management-group/main.json similarity index 100% rename from modules/policy-insights/remediations/management-group/main.json rename to modules/policy-insights/remediation/management-group/main.json diff --git a/modules/policy-insights/remediations/management-group/version.json b/modules/policy-insights/remediation/management-group/version.json similarity index 100% rename from modules/policy-insights/remediations/management-group/version.json rename to modules/policy-insights/remediation/management-group/version.json diff --git a/modules/policy-insights/remediations/resource-group/README.md b/modules/policy-insights/remediation/resource-group/README.md similarity index 100% rename from modules/policy-insights/remediations/resource-group/README.md rename to modules/policy-insights/remediation/resource-group/README.md diff --git a/modules/policy-insights/remediations/resource-group/main.bicep b/modules/policy-insights/remediation/resource-group/main.bicep similarity index 100% rename from modules/policy-insights/remediations/resource-group/main.bicep rename to modules/policy-insights/remediation/resource-group/main.bicep diff --git a/modules/policy-insights/remediations/resource-group/main.json b/modules/policy-insights/remediation/resource-group/main.json similarity index 100% rename from modules/policy-insights/remediations/resource-group/main.json rename to modules/policy-insights/remediation/resource-group/main.json diff --git a/modules/policy-insights/remediations/resource-group/version.json b/modules/policy-insights/remediation/resource-group/version.json similarity index 100% rename from modules/policy-insights/remediations/resource-group/version.json rename to modules/policy-insights/remediation/resource-group/version.json diff --git a/modules/policy-insights/remediations/subscription/README.md b/modules/policy-insights/remediation/subscription/README.md similarity index 100% rename from modules/policy-insights/remediations/subscription/README.md rename to modules/policy-insights/remediation/subscription/README.md diff --git a/modules/policy-insights/remediations/subscription/main.bicep b/modules/policy-insights/remediation/subscription/main.bicep similarity index 100% rename from modules/policy-insights/remediations/subscription/main.bicep rename to modules/policy-insights/remediation/subscription/main.bicep diff --git a/modules/policy-insights/remediations/subscription/main.json b/modules/policy-insights/remediation/subscription/main.json similarity index 100% rename from modules/policy-insights/remediations/subscription/main.json rename to modules/policy-insights/remediation/subscription/main.json diff --git a/modules/policy-insights/remediations/subscription/version.json b/modules/policy-insights/remediation/subscription/version.json similarity index 100% rename from modules/policy-insights/remediations/subscription/version.json rename to modules/policy-insights/remediation/subscription/version.json diff --git a/modules/policy-insights/remediations/version.json b/modules/policy-insights/remediation/version.json similarity index 100% rename from modules/policy-insights/remediations/version.json rename to modules/policy-insights/remediation/version.json diff --git a/modules/power-bi-dedicated/capacities/.bicep/nested_roleAssignments.bicep b/modules/power-bi-dedicated/capacity/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/power-bi-dedicated/capacities/.bicep/nested_roleAssignments.bicep rename to modules/power-bi-dedicated/capacity/.bicep/nested_roleAssignments.bicep diff --git a/modules/power-bi-dedicated/capacities/.test/common/dependencies.bicep b/modules/power-bi-dedicated/capacity/.test/common/dependencies.bicep similarity index 100% rename from modules/power-bi-dedicated/capacities/.test/common/dependencies.bicep rename to modules/power-bi-dedicated/capacity/.test/common/dependencies.bicep diff --git a/modules/power-bi-dedicated/capacities/.test/common/main.test.bicep b/modules/power-bi-dedicated/capacity/.test/common/main.test.bicep similarity index 100% rename from modules/power-bi-dedicated/capacities/.test/common/main.test.bicep rename to modules/power-bi-dedicated/capacity/.test/common/main.test.bicep diff --git a/modules/power-bi-dedicated/capacities/.test/main.test.bicep b/modules/power-bi-dedicated/capacity/.test/main.test.bicep similarity index 100% rename from modules/power-bi-dedicated/capacities/.test/main.test.bicep rename to modules/power-bi-dedicated/capacity/.test/main.test.bicep diff --git a/modules/power-bi-dedicated/capacities/.test/min/dependencies.bicep b/modules/power-bi-dedicated/capacity/.test/min/dependencies.bicep similarity index 100% rename from modules/power-bi-dedicated/capacities/.test/min/dependencies.bicep rename to modules/power-bi-dedicated/capacity/.test/min/dependencies.bicep diff --git a/modules/power-bi-dedicated/capacities/.test/min/main.test.bicep b/modules/power-bi-dedicated/capacity/.test/min/main.test.bicep similarity index 100% rename from modules/power-bi-dedicated/capacities/.test/min/main.test.bicep rename to modules/power-bi-dedicated/capacity/.test/min/main.test.bicep diff --git a/modules/power-bi-dedicated/capacities/README.md b/modules/power-bi-dedicated/capacity/README.md similarity index 98% rename from modules/power-bi-dedicated/capacities/README.md rename to modules/power-bi-dedicated/capacity/README.md index fcce57f05e..e164aba223 100644 --- a/modules/power-bi-dedicated/capacities/README.md +++ b/modules/power-bi-dedicated/capacity/README.md @@ -169,7 +169,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module capacities './power-bi-dedicated/capacities/main.bicep' = { +module capacities './power-bi-dedicated/capacity/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-pbdcapcom' params: { // Required parameters @@ -260,7 +260,7 @@ module capacities './power-bi-dedicated/capacities/main.bicep' = { via Bicep module ```bicep -module capacities './power-bi-dedicated/capacities/main.bicep' = { +module capacities './power-bi-dedicated/capacity/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-pbdcapmin' params: { // Required parameters diff --git a/modules/power-bi-dedicated/capacities/main.bicep b/modules/power-bi-dedicated/capacity/main.bicep similarity index 100% rename from modules/power-bi-dedicated/capacities/main.bicep rename to modules/power-bi-dedicated/capacity/main.bicep diff --git a/modules/power-bi-dedicated/capacities/main.json b/modules/power-bi-dedicated/capacity/main.json similarity index 100% rename from modules/power-bi-dedicated/capacities/main.json rename to modules/power-bi-dedicated/capacity/main.json diff --git a/modules/power-bi-dedicated/capacities/version.json b/modules/power-bi-dedicated/capacity/version.json similarity index 100% rename from modules/power-bi-dedicated/capacities/version.json rename to modules/power-bi-dedicated/capacity/version.json diff --git a/modules/purview/accounts/.bicep/nested_roleAssignments.bicep b/modules/purview/account/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/purview/accounts/.bicep/nested_roleAssignments.bicep rename to modules/purview/account/.bicep/nested_roleAssignments.bicep diff --git a/modules/purview/accounts/.test/common/dependencies.bicep b/modules/purview/account/.test/common/dependencies.bicep similarity index 100% rename from modules/purview/accounts/.test/common/dependencies.bicep rename to modules/purview/account/.test/common/dependencies.bicep diff --git a/modules/purview/accounts/.test/common/main.test.bicep b/modules/purview/account/.test/common/main.test.bicep similarity index 100% rename from modules/purview/accounts/.test/common/main.test.bicep rename to modules/purview/account/.test/common/main.test.bicep diff --git a/modules/purview/accounts/.test/main.test.bicep b/modules/purview/account/.test/main.test.bicep similarity index 100% rename from modules/purview/accounts/.test/main.test.bicep rename to modules/purview/account/.test/main.test.bicep diff --git a/modules/purview/accounts/.test/min/main.test.bicep b/modules/purview/account/.test/min/main.test.bicep similarity index 100% rename from modules/purview/accounts/.test/min/main.test.bicep rename to modules/purview/account/.test/min/main.test.bicep diff --git a/modules/purview/accounts/README.md b/modules/purview/account/README.md similarity index 99% rename from modules/purview/accounts/README.md rename to modules/purview/account/README.md index f2a937d27b..6b99de3ce0 100644 --- a/modules/purview/accounts/README.md +++ b/modules/purview/account/README.md @@ -225,7 +225,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module accounts './purview/accounts/main.bicep' = { +module accounts './purview/account/main.bicep' = { name: '${uniqueString(deployment().name)}-test-pvacom' params: { // Required parameters @@ -520,7 +520,7 @@ module accounts './purview/accounts/main.bicep' = { via Bicep module ```bicep -module accounts './purview/accounts/main.bicep' = { +module accounts './purview/account/main.bicep' = { name: '${uniqueString(deployment().name)}-test-pvamin' params: { // Required parameters diff --git a/modules/purview/accounts/main.bicep b/modules/purview/account/main.bicep similarity index 96% rename from modules/purview/accounts/main.bicep rename to modules/purview/account/main.bicep index cb296bb4e8..6d888fb1ed 100644 --- a/modules/purview/accounts/main.bicep +++ b/modules/purview/account/main.bicep @@ -185,7 +185,7 @@ resource purview_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@2021- scope: account } -module account_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in accountPrivateEndpoints: { +module account_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in accountPrivateEndpoints: { name: '${uniqueString(deployment().name, location)}-Account-PrivateEndpoint-${index}' params: { groupIds: [ @@ -208,7 +208,7 @@ module account_privateEndpoints '../../network/private-endpoints/main.bicep' = [ } }] -module portal_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in portalPrivateEndpoints: { +module portal_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in portalPrivateEndpoints: { name: '${uniqueString(deployment().name, location)}-Portal-PrivateEndpoint-${index}' params: { groupIds: [ @@ -231,7 +231,7 @@ module portal_privateEndpoints '../../network/private-endpoints/main.bicep' = [f } }] -module blob_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in storageBlobPrivateEndpoints: { +module blob_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in storageBlobPrivateEndpoints: { name: '${uniqueString(deployment().name, location)}-Storage-Blob-PrivateEndpoint-${index}' params: { groupIds: [ @@ -254,7 +254,7 @@ module blob_privateEndpoints '../../network/private-endpoints/main.bicep' = [for } }] -module queue_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in storageQueuePrivateEndpoints: { +module queue_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in storageQueuePrivateEndpoints: { name: '${uniqueString(deployment().name, location)}-Storage-Queue-PrivateEndpoint-${index}' params: { groupIds: [ @@ -277,7 +277,7 @@ module queue_privateEndpoints '../../network/private-endpoints/main.bicep' = [fo } }] -module eventHub_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in eventHubPrivateEndpoints: { +module eventHub_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in eventHubPrivateEndpoints: { name: '${uniqueString(deployment().name, location)}-Eventhub-Namespace-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/purview/accounts/main.json b/modules/purview/account/main.json similarity index 100% rename from modules/purview/accounts/main.json rename to modules/purview/account/main.json diff --git a/modules/purview/accounts/version.json b/modules/purview/account/version.json similarity index 100% rename from modules/purview/accounts/version.json rename to modules/purview/account/version.json diff --git a/modules/recovery-services/vaults/.bicep/nested_roleAssignments.bicep b/modules/recovery-services/vault/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/recovery-services/vaults/.bicep/nested_roleAssignments.bicep rename to modules/recovery-services/vault/.bicep/nested_roleAssignments.bicep diff --git a/modules/recovery-services/vaults/.test/common/dependencies.bicep b/modules/recovery-services/vault/.test/common/dependencies.bicep similarity index 100% rename from modules/recovery-services/vaults/.test/common/dependencies.bicep rename to modules/recovery-services/vault/.test/common/dependencies.bicep diff --git a/modules/recovery-services/vaults/.test/common/main.test.bicep b/modules/recovery-services/vault/.test/common/main.test.bicep similarity index 100% rename from modules/recovery-services/vaults/.test/common/main.test.bicep rename to modules/recovery-services/vault/.test/common/main.test.bicep diff --git a/modules/recovery-services/vaults/.test/dr/main.test.bicep b/modules/recovery-services/vault/.test/dr/main.test.bicep similarity index 100% rename from modules/recovery-services/vaults/.test/dr/main.test.bicep rename to modules/recovery-services/vault/.test/dr/main.test.bicep diff --git a/modules/recovery-services/vaults/.test/main.test.bicep b/modules/recovery-services/vault/.test/main.test.bicep similarity index 100% rename from modules/recovery-services/vaults/.test/main.test.bicep rename to modules/recovery-services/vault/.test/main.test.bicep diff --git a/modules/recovery-services/vaults/.test/min/main.test.bicep b/modules/recovery-services/vault/.test/min/main.test.bicep similarity index 100% rename from modules/recovery-services/vaults/.test/min/main.test.bicep rename to modules/recovery-services/vault/.test/min/main.test.bicep diff --git a/modules/recovery-services/vaults/README.md b/modules/recovery-services/vault/README.md similarity index 99% rename from modules/recovery-services/vaults/README.md rename to modules/recovery-services/vault/README.md index a2aaf017e8..7461aaf002 100644 --- a/modules/recovery-services/vaults/README.md +++ b/modules/recovery-services/vault/README.md @@ -944,7 +944,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module vaults './recovery-services/vaults/main.bicep' = { +module vaults './recovery-services/vault/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-rsvcom' params: { // Required parameters @@ -1603,7 +1603,7 @@ module vaults './recovery-services/vaults/main.bicep' = { via Bicep module ```bicep -module vaults './recovery-services/vaults/main.bicep' = { +module vaults './recovery-services/vault/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-rsvdr' params: { // Required parameters @@ -1772,7 +1772,7 @@ module vaults './recovery-services/vaults/main.bicep' = { via Bicep module ```bicep -module vaults './recovery-services/vaults/main.bicep' = { +module vaults './recovery-services/vault/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-rsvmin' params: { // Required parameters diff --git a/modules/recovery-services/vaults/backup-config/README.md b/modules/recovery-services/vault/backup-config/README.md similarity index 100% rename from modules/recovery-services/vaults/backup-config/README.md rename to modules/recovery-services/vault/backup-config/README.md diff --git a/modules/recovery-services/vaults/backup-config/main.bicep b/modules/recovery-services/vault/backup-config/main.bicep similarity index 100% rename from modules/recovery-services/vaults/backup-config/main.bicep rename to modules/recovery-services/vault/backup-config/main.bicep diff --git a/modules/recovery-services/vaults/backup-config/main.json b/modules/recovery-services/vault/backup-config/main.json similarity index 100% rename from modules/recovery-services/vaults/backup-config/main.json rename to modules/recovery-services/vault/backup-config/main.json diff --git a/modules/recovery-services/vaults/backup-config/version.json b/modules/recovery-services/vault/backup-config/version.json similarity index 100% rename from modules/recovery-services/vaults/backup-config/version.json rename to modules/recovery-services/vault/backup-config/version.json diff --git a/modules/recovery-services/vaults/backup-fabrics/protection-containers/README.md b/modules/recovery-services/vault/backup-fabrics/protection-containers/README.md similarity index 100% rename from modules/recovery-services/vaults/backup-fabrics/protection-containers/README.md rename to modules/recovery-services/vault/backup-fabrics/protection-containers/README.md diff --git a/modules/recovery-services/vaults/backup-fabrics/protection-containers/main.bicep b/modules/recovery-services/vault/backup-fabrics/protection-containers/main.bicep similarity index 96% rename from modules/recovery-services/vaults/backup-fabrics/protection-containers/main.bicep rename to modules/recovery-services/vault/backup-fabrics/protection-containers/main.bicep index cd3ba48b90..3cb51c17c7 100644 --- a/modules/recovery-services/vaults/backup-fabrics/protection-containers/main.bicep +++ b/modules/recovery-services/vault/backup-fabrics/protection-containers/main.bicep @@ -77,7 +77,7 @@ resource protectionContainer 'Microsoft.RecoveryServices/vaults/backupFabrics/pr } } -module protectionContainer_protectedItems 'protected-items/main.bicep' = [for (protectedItem, index) in protectedItems: { +module protectionContainer_protectedItems 'protected-item/main.bicep' = [for (protectedItem, index) in protectedItems: { name: '${uniqueString(deployment().name, location)}-ProtectedItem-${index}' params: { policyId: protectedItem.policyId diff --git a/modules/recovery-services/vaults/backup-fabrics/protection-containers/main.json b/modules/recovery-services/vault/backup-fabrics/protection-containers/main.json similarity index 100% rename from modules/recovery-services/vaults/backup-fabrics/protection-containers/main.json rename to modules/recovery-services/vault/backup-fabrics/protection-containers/main.json diff --git a/modules/recovery-services/vaults/backup-fabrics/protection-containers/protected-items/README.md b/modules/recovery-services/vault/backup-fabrics/protection-containers/protected-items/README.md similarity index 100% rename from modules/recovery-services/vaults/backup-fabrics/protection-containers/protected-items/README.md rename to modules/recovery-services/vault/backup-fabrics/protection-containers/protected-items/README.md diff --git a/modules/recovery-services/vaults/backup-fabrics/protection-containers/protected-items/main.bicep b/modules/recovery-services/vault/backup-fabrics/protection-containers/protected-items/main.bicep similarity index 100% rename from modules/recovery-services/vaults/backup-fabrics/protection-containers/protected-items/main.bicep rename to modules/recovery-services/vault/backup-fabrics/protection-containers/protected-items/main.bicep diff --git a/modules/recovery-services/vaults/backup-fabrics/protection-containers/protected-items/main.json b/modules/recovery-services/vault/backup-fabrics/protection-containers/protected-items/main.json similarity index 100% rename from modules/recovery-services/vaults/backup-fabrics/protection-containers/protected-items/main.json rename to modules/recovery-services/vault/backup-fabrics/protection-containers/protected-items/main.json diff --git a/modules/recovery-services/vaults/backup-fabrics/protection-containers/protected-items/version.json b/modules/recovery-services/vault/backup-fabrics/protection-containers/protected-items/version.json similarity index 100% rename from modules/recovery-services/vaults/backup-fabrics/protection-containers/protected-items/version.json rename to modules/recovery-services/vault/backup-fabrics/protection-containers/protected-items/version.json diff --git a/modules/recovery-services/vaults/backup-fabrics/protection-containers/version.json b/modules/recovery-services/vault/backup-fabrics/protection-containers/version.json similarity index 100% rename from modules/recovery-services/vaults/backup-fabrics/protection-containers/version.json rename to modules/recovery-services/vault/backup-fabrics/protection-containers/version.json diff --git a/modules/recovery-services/vaults/backup-policies/README.md b/modules/recovery-services/vault/backup-policies/README.md similarity index 100% rename from modules/recovery-services/vaults/backup-policies/README.md rename to modules/recovery-services/vault/backup-policies/README.md diff --git a/modules/recovery-services/vaults/backup-policies/main.bicep b/modules/recovery-services/vault/backup-policies/main.bicep similarity index 100% rename from modules/recovery-services/vaults/backup-policies/main.bicep rename to modules/recovery-services/vault/backup-policies/main.bicep diff --git a/modules/recovery-services/vaults/backup-policies/main.json b/modules/recovery-services/vault/backup-policies/main.json similarity index 100% rename from modules/recovery-services/vaults/backup-policies/main.json rename to modules/recovery-services/vault/backup-policies/main.json diff --git a/modules/recovery-services/vaults/backup-policies/version.json b/modules/recovery-services/vault/backup-policies/version.json similarity index 100% rename from modules/recovery-services/vaults/backup-policies/version.json rename to modules/recovery-services/vault/backup-policies/version.json diff --git a/modules/recovery-services/vaults/backup-storage-config/README.md b/modules/recovery-services/vault/backup-storage-config/README.md similarity index 100% rename from modules/recovery-services/vaults/backup-storage-config/README.md rename to modules/recovery-services/vault/backup-storage-config/README.md diff --git a/modules/recovery-services/vaults/backup-storage-config/main.bicep b/modules/recovery-services/vault/backup-storage-config/main.bicep similarity index 100% rename from modules/recovery-services/vaults/backup-storage-config/main.bicep rename to modules/recovery-services/vault/backup-storage-config/main.bicep diff --git a/modules/recovery-services/vaults/backup-storage-config/main.json b/modules/recovery-services/vault/backup-storage-config/main.json similarity index 100% rename from modules/recovery-services/vaults/backup-storage-config/main.json rename to modules/recovery-services/vault/backup-storage-config/main.json diff --git a/modules/recovery-services/vaults/backup-storage-config/version.json b/modules/recovery-services/vault/backup-storage-config/version.json similarity index 100% rename from modules/recovery-services/vaults/backup-storage-config/version.json rename to modules/recovery-services/vault/backup-storage-config/version.json diff --git a/modules/recovery-services/vaults/main.bicep b/modules/recovery-services/vault/main.bicep similarity index 95% rename from modules/recovery-services/vaults/main.bicep rename to modules/recovery-services/vault/main.bicep index 4064e4a7bc..e84ff6015f 100644 --- a/modules/recovery-services/vaults/main.bicep +++ b/modules/recovery-services/vault/main.bicep @@ -189,7 +189,7 @@ resource rsv 'Microsoft.RecoveryServices/vaults@2023-01-01' = { } } -module rsv_replicationFabrics 'replication-fabrics/main.bicep' = [for (replicationFabric, index) in replicationFabrics: { +module rsv_replicationFabrics 'replication-fabric/main.bicep' = [for (replicationFabric, index) in replicationFabrics: { name: '${uniqueString(deployment().name, location)}-RSV-Fabric-${index}' params: { recoveryVaultName: rsv.name @@ -203,7 +203,7 @@ module rsv_replicationFabrics 'replication-fabrics/main.bicep' = [for (replicati ] }] -module rsv_replicationPolicies 'replication-policies/main.bicep' = [for (replicationPolicy, index) in replicationPolicies: { +module rsv_replicationPolicies 'replication-policy/main.bicep' = [for (replicationPolicy, index) in replicationPolicies: { name: '${uniqueString(deployment().name, location)}-RSV-Policy-${index}' params: { name: replicationPolicy.name @@ -226,7 +226,7 @@ module rsv_backupStorageConfiguration 'backup-storage-config/main.bicep' = if (! } } -module rsv_backupFabric_protectionContainers 'backup-fabrics/protection-containers/main.bicep' = [for (protectionContainer, index) in protectionContainers: { +module rsv_backupFabric_protectionContainers 'backup-fabrics/protection-container/main.bicep' = [for (protectionContainer, index) in protectionContainers: { name: '${uniqueString(deployment().name, location)}-RSV-ProtectionContainers-${index}' params: { recoveryVaultName: rsv.name @@ -241,7 +241,7 @@ module rsv_backupFabric_protectionContainers 'backup-fabrics/protection-containe } }] -module rsv_backupPolicies 'backup-policies/main.bicep' = [for (backupPolicy, index) in backupPolicies: { +module rsv_backupPolicies 'backup-policy/main.bicep' = [for (backupPolicy, index) in backupPolicies: { name: '${uniqueString(deployment().name, location)}-RSV-BackupPolicy-${index}' params: { recoveryVaultName: rsv.name @@ -267,7 +267,7 @@ module rsv_backupConfig 'backup-config/main.bicep' = if (!empty(backupConfig)) { } } -module rsv_replicationAlertSettings 'replication-alert-settings/main.bicep' = if (!empty(replicationAlertSettings)) { +module rsv_replicationAlertSettings 'replication-alert-setting/main.bicep' = if (!empty(replicationAlertSettings)) { name: '${uniqueString(deployment().name, location)}-RSV-replicationAlertSettings' params: { name: 'defaultAlertSetting' @@ -301,7 +301,7 @@ resource rsv_diagnosticSettings 'Microsoft.Insights/diagnosticSettings@2021-05-0 scope: rsv } -module rsv_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module rsv_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-RSV-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/recovery-services/vaults/main.json b/modules/recovery-services/vault/main.json similarity index 100% rename from modules/recovery-services/vaults/main.json rename to modules/recovery-services/vault/main.json diff --git a/modules/recovery-services/vaults/replication-alert-settings/README.md b/modules/recovery-services/vault/replication-alert-settings/README.md similarity index 100% rename from modules/recovery-services/vaults/replication-alert-settings/README.md rename to modules/recovery-services/vault/replication-alert-settings/README.md diff --git a/modules/recovery-services/vaults/replication-alert-settings/main.bicep b/modules/recovery-services/vault/replication-alert-settings/main.bicep similarity index 100% rename from modules/recovery-services/vaults/replication-alert-settings/main.bicep rename to modules/recovery-services/vault/replication-alert-settings/main.bicep diff --git a/modules/recovery-services/vaults/replication-alert-settings/main.json b/modules/recovery-services/vault/replication-alert-settings/main.json similarity index 100% rename from modules/recovery-services/vaults/replication-alert-settings/main.json rename to modules/recovery-services/vault/replication-alert-settings/main.json diff --git a/modules/recovery-services/vaults/replication-alert-settings/version.json b/modules/recovery-services/vault/replication-alert-settings/version.json similarity index 100% rename from modules/recovery-services/vaults/replication-alert-settings/version.json rename to modules/recovery-services/vault/replication-alert-settings/version.json diff --git a/modules/recovery-services/vaults/replication-fabrics/README.md b/modules/recovery-services/vault/replication-fabrics/README.md similarity index 100% rename from modules/recovery-services/vaults/replication-fabrics/README.md rename to modules/recovery-services/vault/replication-fabrics/README.md diff --git a/modules/recovery-services/vaults/replication-fabrics/main.bicep b/modules/recovery-services/vault/replication-fabrics/main.bicep similarity index 97% rename from modules/recovery-services/vaults/replication-fabrics/main.bicep rename to modules/recovery-services/vault/replication-fabrics/main.bicep index f33c37952e..d49d7ecd3a 100644 --- a/modules/recovery-services/vaults/replication-fabrics/main.bicep +++ b/modules/recovery-services/vault/replication-fabrics/main.bicep @@ -43,7 +43,7 @@ resource replicationFabric 'Microsoft.RecoveryServices/vaults/replicationFabrics } } -module fabric_replicationContainers 'replication-protection-containers/main.bicep' = [for (container, index) in replicationContainers: { +module fabric_replicationContainers 'replication-protection-container/main.bicep' = [for (container, index) in replicationContainers: { name: '${deployment().name}-RCont-${index}' params: { name: container.name diff --git a/modules/recovery-services/vaults/replication-fabrics/main.json b/modules/recovery-services/vault/replication-fabrics/main.json similarity index 100% rename from modules/recovery-services/vaults/replication-fabrics/main.json rename to modules/recovery-services/vault/replication-fabrics/main.json diff --git a/modules/recovery-services/vaults/replication-fabrics/replication-protection-containers/README.md b/modules/recovery-services/vault/replication-fabrics/replication-protection-containers/README.md similarity index 100% rename from modules/recovery-services/vaults/replication-fabrics/replication-protection-containers/README.md rename to modules/recovery-services/vault/replication-fabrics/replication-protection-containers/README.md diff --git a/modules/recovery-services/vaults/replication-fabrics/replication-protection-containers/main.bicep b/modules/recovery-services/vault/replication-fabrics/replication-protection-containers/main.bicep similarity index 97% rename from modules/recovery-services/vaults/replication-fabrics/replication-protection-containers/main.bicep rename to modules/recovery-services/vault/replication-fabrics/replication-protection-containers/main.bicep index 4ed96e57d7..27bcca2023 100644 --- a/modules/recovery-services/vaults/replication-fabrics/replication-protection-containers/main.bicep +++ b/modules/recovery-services/vault/replication-fabrics/replication-protection-containers/main.bicep @@ -44,7 +44,7 @@ resource replicationContainer 'Microsoft.RecoveryServices/vaults/replicationFabr } } -module fabric_container_containerMappings 'replication-protection-container-mappings/main.bicep' = [for (mapping, index) in replicationContainerMappings: { +module fabric_container_containerMappings 'replication-protection-container-mapping/main.bicep' = [for (mapping, index) in replicationContainerMappings: { name: '${deployment().name}-Map-${index}' params: { name: contains(mapping, 'name') ? mapping.name : '' diff --git a/modules/recovery-services/vaults/replication-fabrics/replication-protection-containers/main.json b/modules/recovery-services/vault/replication-fabrics/replication-protection-containers/main.json similarity index 100% rename from modules/recovery-services/vaults/replication-fabrics/replication-protection-containers/main.json rename to modules/recovery-services/vault/replication-fabrics/replication-protection-containers/main.json diff --git a/modules/recovery-services/vaults/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/README.md b/modules/recovery-services/vault/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/README.md similarity index 100% rename from modules/recovery-services/vaults/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/README.md rename to modules/recovery-services/vault/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/README.md diff --git a/modules/recovery-services/vaults/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/main.bicep b/modules/recovery-services/vault/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/main.bicep similarity index 100% rename from modules/recovery-services/vaults/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/main.bicep rename to modules/recovery-services/vault/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/main.bicep diff --git a/modules/recovery-services/vaults/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/main.json b/modules/recovery-services/vault/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/main.json similarity index 100% rename from modules/recovery-services/vaults/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/main.json rename to modules/recovery-services/vault/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/main.json diff --git a/modules/recovery-services/vaults/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/version.json b/modules/recovery-services/vault/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/version.json similarity index 100% rename from modules/recovery-services/vaults/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/version.json rename to modules/recovery-services/vault/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/version.json diff --git a/modules/recovery-services/vaults/replication-fabrics/replication-protection-containers/version.json b/modules/recovery-services/vault/replication-fabrics/replication-protection-containers/version.json similarity index 100% rename from modules/recovery-services/vaults/replication-fabrics/replication-protection-containers/version.json rename to modules/recovery-services/vault/replication-fabrics/replication-protection-containers/version.json diff --git a/modules/recovery-services/vaults/replication-fabrics/version.json b/modules/recovery-services/vault/replication-fabrics/version.json similarity index 100% rename from modules/recovery-services/vaults/replication-fabrics/version.json rename to modules/recovery-services/vault/replication-fabrics/version.json diff --git a/modules/recovery-services/vaults/replication-policies/README.md b/modules/recovery-services/vault/replication-policies/README.md similarity index 100% rename from modules/recovery-services/vaults/replication-policies/README.md rename to modules/recovery-services/vault/replication-policies/README.md diff --git a/modules/recovery-services/vaults/replication-policies/main.bicep b/modules/recovery-services/vault/replication-policies/main.bicep similarity index 100% rename from modules/recovery-services/vaults/replication-policies/main.bicep rename to modules/recovery-services/vault/replication-policies/main.bicep diff --git a/modules/recovery-services/vaults/replication-policies/main.json b/modules/recovery-services/vault/replication-policies/main.json similarity index 100% rename from modules/recovery-services/vaults/replication-policies/main.json rename to modules/recovery-services/vault/replication-policies/main.json diff --git a/modules/recovery-services/vaults/replication-policies/version.json b/modules/recovery-services/vault/replication-policies/version.json similarity index 100% rename from modules/recovery-services/vaults/replication-policies/version.json rename to modules/recovery-services/vault/replication-policies/version.json diff --git a/modules/recovery-services/vaults/version.json b/modules/recovery-services/vault/version.json similarity index 100% rename from modules/recovery-services/vaults/version.json rename to modules/recovery-services/vault/version.json diff --git a/modules/relay/namespaces/.bicep/nested_roleAssignments.bicep b/modules/relay/namespace/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/relay/namespaces/.bicep/nested_roleAssignments.bicep rename to modules/relay/namespace/.bicep/nested_roleAssignments.bicep diff --git a/modules/relay/namespaces/.test/common/dependencies.bicep b/modules/relay/namespace/.test/common/dependencies.bicep similarity index 100% rename from modules/relay/namespaces/.test/common/dependencies.bicep rename to modules/relay/namespace/.test/common/dependencies.bicep diff --git a/modules/relay/namespaces/.test/common/main.test.bicep b/modules/relay/namespace/.test/common/main.test.bicep similarity index 100% rename from modules/relay/namespaces/.test/common/main.test.bicep rename to modules/relay/namespace/.test/common/main.test.bicep diff --git a/modules/relay/namespaces/.test/main.test.bicep b/modules/relay/namespace/.test/main.test.bicep similarity index 100% rename from modules/relay/namespaces/.test/main.test.bicep rename to modules/relay/namespace/.test/main.test.bicep diff --git a/modules/relay/namespaces/.test/min/main.test.bicep b/modules/relay/namespace/.test/min/main.test.bicep similarity index 100% rename from modules/relay/namespaces/.test/min/main.test.bicep rename to modules/relay/namespace/.test/min/main.test.bicep diff --git a/modules/relay/namespaces/.test/pe/dependencies.bicep b/modules/relay/namespace/.test/pe/dependencies.bicep similarity index 100% rename from modules/relay/namespaces/.test/pe/dependencies.bicep rename to modules/relay/namespace/.test/pe/dependencies.bicep diff --git a/modules/relay/namespaces/.test/pe/main.test.bicep b/modules/relay/namespace/.test/pe/main.test.bicep similarity index 100% rename from modules/relay/namespaces/.test/pe/main.test.bicep rename to modules/relay/namespace/.test/pe/main.test.bicep diff --git a/modules/relay/namespaces/README.md b/modules/relay/namespace/README.md similarity index 99% rename from modules/relay/namespaces/README.md rename to modules/relay/namespace/README.md index b80b075068..1b19542f1d 100644 --- a/modules/relay/namespaces/README.md +++ b/modules/relay/namespace/README.md @@ -291,7 +291,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module namespaces './relay/namespaces/main.bicep' = { +module namespaces './relay/namespace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-rncom' params: { // Required parameters @@ -572,7 +572,7 @@ module namespaces './relay/namespaces/main.bicep' = { via Bicep module ```bicep -module namespaces './relay/namespaces/main.bicep' = { +module namespaces './relay/namespace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-rnmin' params: { // Required parameters @@ -617,7 +617,7 @@ module namespaces './relay/namespaces/main.bicep' = { via Bicep module ```bicep -module namespaces './relay/namespaces/main.bicep' = { +module namespaces './relay/namespace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-rnpe' params: { // Required parameters diff --git a/modules/relay/namespaces/authorization-rules/README.md b/modules/relay/namespace/authorization-rules/README.md similarity index 100% rename from modules/relay/namespaces/authorization-rules/README.md rename to modules/relay/namespace/authorization-rules/README.md diff --git a/modules/relay/namespaces/authorization-rules/main.bicep b/modules/relay/namespace/authorization-rules/main.bicep similarity index 100% rename from modules/relay/namespaces/authorization-rules/main.bicep rename to modules/relay/namespace/authorization-rules/main.bicep diff --git a/modules/relay/namespaces/authorization-rules/main.json b/modules/relay/namespace/authorization-rules/main.json similarity index 100% rename from modules/relay/namespaces/authorization-rules/main.json rename to modules/relay/namespace/authorization-rules/main.json diff --git a/modules/relay/namespaces/authorization-rules/version.json b/modules/relay/namespace/authorization-rules/version.json similarity index 100% rename from modules/relay/namespaces/authorization-rules/version.json rename to modules/relay/namespace/authorization-rules/version.json diff --git a/modules/relay/namespaces/hybrid-connections/.bicep/nested_roleAssignments.bicep b/modules/relay/namespace/hybrid-connections/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/relay/namespaces/hybrid-connections/.bicep/nested_roleAssignments.bicep rename to modules/relay/namespace/hybrid-connections/.bicep/nested_roleAssignments.bicep diff --git a/modules/relay/namespaces/hybrid-connections/README.md b/modules/relay/namespace/hybrid-connections/README.md similarity index 100% rename from modules/relay/namespaces/hybrid-connections/README.md rename to modules/relay/namespace/hybrid-connections/README.md diff --git a/modules/relay/namespaces/hybrid-connections/authorization-rules/README.md b/modules/relay/namespace/hybrid-connections/authorization-rules/README.md similarity index 100% rename from modules/relay/namespaces/hybrid-connections/authorization-rules/README.md rename to modules/relay/namespace/hybrid-connections/authorization-rules/README.md diff --git a/modules/relay/namespaces/hybrid-connections/authorization-rules/main.bicep b/modules/relay/namespace/hybrid-connections/authorization-rules/main.bicep similarity index 100% rename from modules/relay/namespaces/hybrid-connections/authorization-rules/main.bicep rename to modules/relay/namespace/hybrid-connections/authorization-rules/main.bicep diff --git a/modules/relay/namespaces/hybrid-connections/authorization-rules/main.json b/modules/relay/namespace/hybrid-connections/authorization-rules/main.json similarity index 100% rename from modules/relay/namespaces/hybrid-connections/authorization-rules/main.json rename to modules/relay/namespace/hybrid-connections/authorization-rules/main.json diff --git a/modules/relay/namespaces/hybrid-connections/authorization-rules/version.json b/modules/relay/namespace/hybrid-connections/authorization-rules/version.json similarity index 100% rename from modules/relay/namespaces/hybrid-connections/authorization-rules/version.json rename to modules/relay/namespace/hybrid-connections/authorization-rules/version.json diff --git a/modules/relay/namespaces/hybrid-connections/main.bicep b/modules/relay/namespace/hybrid-connections/main.bicep similarity index 97% rename from modules/relay/namespaces/hybrid-connections/main.bicep rename to modules/relay/namespace/hybrid-connections/main.bicep index fe3e9013a7..280f1efc02 100644 --- a/modules/relay/namespaces/hybrid-connections/main.bicep +++ b/modules/relay/namespace/hybrid-connections/main.bicep @@ -83,7 +83,7 @@ resource hybridConnection 'Microsoft.Relay/namespaces/hybridConnections@2021-11- } } -module hybridConnection_authorizationRules 'authorization-rules/main.bicep' = [for (authorizationRule, index) in authorizationRules: { +module hybridConnection_authorizationRules 'authorization-rule/main.bicep' = [for (authorizationRule, index) in authorizationRules: { name: '${deployment().name}-AuthorizationRule-${index}' params: { namespaceName: namespaceName diff --git a/modules/relay/namespaces/hybrid-connections/main.json b/modules/relay/namespace/hybrid-connections/main.json similarity index 100% rename from modules/relay/namespaces/hybrid-connections/main.json rename to modules/relay/namespace/hybrid-connections/main.json diff --git a/modules/relay/namespaces/hybrid-connections/version.json b/modules/relay/namespace/hybrid-connections/version.json similarity index 100% rename from modules/relay/namespaces/hybrid-connections/version.json rename to modules/relay/namespace/hybrid-connections/version.json diff --git a/modules/relay/namespaces/main.bicep b/modules/relay/namespace/main.bicep similarity index 95% rename from modules/relay/namespaces/main.bicep rename to modules/relay/namespace/main.bicep index ed07aa8e7a..6287d52dd6 100644 --- a/modules/relay/namespaces/main.bicep +++ b/modules/relay/namespace/main.bicep @@ -151,7 +151,7 @@ resource namespace 'Microsoft.Relay/namespaces@2021-11-01' = { properties: {} } -module namespace_authorizationRules 'authorization-rules/main.bicep' = [for (authorizationRule, index) in authorizationRules: { +module namespace_authorizationRules 'authorization-rule/main.bicep' = [for (authorizationRule, index) in authorizationRules: { name: '${uniqueString(deployment().name, location)}-AuthorizationRules-${index}' params: { namespaceName: namespace.name @@ -161,7 +161,7 @@ module namespace_authorizationRules 'authorization-rules/main.bicep' = [for (aut } }] -module namespace_networkRuleSet 'network-rule-sets/main.bicep' = if (!empty(networkRuleSets) || !empty(privateEndpoints)) { +module namespace_networkRuleSet 'network-rule-set/main.bicep' = if (!empty(networkRuleSets) || !empty(privateEndpoints)) { name: '${uniqueString(deployment().name, location)}-NetworkRuleSet' params: { namespaceName: namespace.name @@ -172,7 +172,7 @@ module namespace_networkRuleSet 'network-rule-sets/main.bicep' = if (!empty(netw } } -module namespace_hybridConnections 'hybrid-connections/main.bicep' = [for (hybridConnection, index) in hybridConnections: { +module namespace_hybridConnections 'hybrid-connection/main.bicep' = [for (hybridConnection, index) in hybridConnections: { name: '${uniqueString(deployment().name, location)}-HybridConnection-${index}' params: { namespaceName: namespace.name @@ -205,7 +205,7 @@ module namespace_hybridConnections 'hybrid-connections/main.bicep' = [for (hybri } }] -module namespace_wcfRelays 'wcf-relays/main.bicep' = [for (wcfRelay, index) in wcfRelays: { +module namespace_wcfRelays 'wcf-relay/main.bicep' = [for (wcfRelay, index) in wcfRelays: { name: '${uniqueString(deployment().name, location)}-WcfRelay-${index}' params: { namespaceName: namespace.name @@ -262,7 +262,7 @@ resource namespace_diagnosticSettings 'Microsoft.Insights/diagnosticSettings@202 scope: namespace } -module namespace_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module namespace_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-Namespace-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/relay/namespaces/main.json b/modules/relay/namespace/main.json similarity index 100% rename from modules/relay/namespaces/main.json rename to modules/relay/namespace/main.json diff --git a/modules/relay/namespaces/network-rule-sets/README.md b/modules/relay/namespace/network-rule-sets/README.md similarity index 100% rename from modules/relay/namespaces/network-rule-sets/README.md rename to modules/relay/namespace/network-rule-sets/README.md diff --git a/modules/relay/namespaces/network-rule-sets/main.bicep b/modules/relay/namespace/network-rule-sets/main.bicep similarity index 100% rename from modules/relay/namespaces/network-rule-sets/main.bicep rename to modules/relay/namespace/network-rule-sets/main.bicep diff --git a/modules/relay/namespaces/network-rule-sets/main.json b/modules/relay/namespace/network-rule-sets/main.json similarity index 100% rename from modules/relay/namespaces/network-rule-sets/main.json rename to modules/relay/namespace/network-rule-sets/main.json diff --git a/modules/relay/namespaces/network-rule-sets/version.json b/modules/relay/namespace/network-rule-sets/version.json similarity index 100% rename from modules/relay/namespaces/network-rule-sets/version.json rename to modules/relay/namespace/network-rule-sets/version.json diff --git a/modules/relay/namespaces/version.json b/modules/relay/namespace/version.json similarity index 100% rename from modules/relay/namespaces/version.json rename to modules/relay/namespace/version.json diff --git a/modules/relay/namespaces/wcf-relays/.bicep/nested_roleAssignments.bicep b/modules/relay/namespace/wcf-relays/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/relay/namespaces/wcf-relays/.bicep/nested_roleAssignments.bicep rename to modules/relay/namespace/wcf-relays/.bicep/nested_roleAssignments.bicep diff --git a/modules/relay/namespaces/wcf-relays/README.md b/modules/relay/namespace/wcf-relays/README.md similarity index 100% rename from modules/relay/namespaces/wcf-relays/README.md rename to modules/relay/namespace/wcf-relays/README.md diff --git a/modules/relay/namespaces/wcf-relays/authorization-rules/README.md b/modules/relay/namespace/wcf-relays/authorization-rules/README.md similarity index 100% rename from modules/relay/namespaces/wcf-relays/authorization-rules/README.md rename to modules/relay/namespace/wcf-relays/authorization-rules/README.md diff --git a/modules/relay/namespaces/wcf-relays/authorization-rules/main.bicep b/modules/relay/namespace/wcf-relays/authorization-rules/main.bicep similarity index 100% rename from modules/relay/namespaces/wcf-relays/authorization-rules/main.bicep rename to modules/relay/namespace/wcf-relays/authorization-rules/main.bicep diff --git a/modules/relay/namespaces/wcf-relays/authorization-rules/main.json b/modules/relay/namespace/wcf-relays/authorization-rules/main.json similarity index 100% rename from modules/relay/namespaces/wcf-relays/authorization-rules/main.json rename to modules/relay/namespace/wcf-relays/authorization-rules/main.json diff --git a/modules/relay/namespaces/wcf-relays/authorization-rules/version.json b/modules/relay/namespace/wcf-relays/authorization-rules/version.json similarity index 100% rename from modules/relay/namespaces/wcf-relays/authorization-rules/version.json rename to modules/relay/namespace/wcf-relays/authorization-rules/version.json diff --git a/modules/relay/namespaces/wcf-relays/main.bicep b/modules/relay/namespace/wcf-relays/main.bicep similarity index 97% rename from modules/relay/namespaces/wcf-relays/main.bicep rename to modules/relay/namespace/wcf-relays/main.bicep index 59bc3b5d8f..171e2d99ba 100644 --- a/modules/relay/namespaces/wcf-relays/main.bicep +++ b/modules/relay/namespace/wcf-relays/main.bicep @@ -95,7 +95,7 @@ resource wcfRelay 'Microsoft.Relay/namespaces/wcfRelays@2021-11-01' = { } } -module wcfRelay_authorizationRules 'authorization-rules/main.bicep' = [for (authorizationRule, index) in authorizationRules: { +module wcfRelay_authorizationRules 'authorization-rule/main.bicep' = [for (authorizationRule, index) in authorizationRules: { name: '${deployment().name}-AuthorizationRule-${index}' params: { namespaceName: namespaceName diff --git a/modules/relay/namespaces/wcf-relays/main.json b/modules/relay/namespace/wcf-relays/main.json similarity index 100% rename from modules/relay/namespaces/wcf-relays/main.json rename to modules/relay/namespace/wcf-relays/main.json diff --git a/modules/relay/namespaces/wcf-relays/version.json b/modules/relay/namespace/wcf-relays/version.json similarity index 100% rename from modules/relay/namespaces/wcf-relays/version.json rename to modules/relay/namespace/wcf-relays/version.json diff --git a/modules/resources/deployment-scripts/.test/cli/dependencies.bicep b/modules/resources/deployment-script/.test/cli/dependencies.bicep similarity index 100% rename from modules/resources/deployment-scripts/.test/cli/dependencies.bicep rename to modules/resources/deployment-script/.test/cli/dependencies.bicep diff --git a/modules/resources/deployment-scripts/.test/cli/main.test.bicep b/modules/resources/deployment-script/.test/cli/main.test.bicep similarity index 100% rename from modules/resources/deployment-scripts/.test/cli/main.test.bicep rename to modules/resources/deployment-script/.test/cli/main.test.bicep diff --git a/modules/resources/deployment-scripts/.test/main.test.bicep b/modules/resources/deployment-script/.test/main.test.bicep similarity index 100% rename from modules/resources/deployment-scripts/.test/main.test.bicep rename to modules/resources/deployment-script/.test/main.test.bicep diff --git a/modules/resources/deployment-scripts/.test/ps/dependencies.bicep b/modules/resources/deployment-script/.test/ps/dependencies.bicep similarity index 100% rename from modules/resources/deployment-scripts/.test/ps/dependencies.bicep rename to modules/resources/deployment-script/.test/ps/dependencies.bicep diff --git a/modules/resources/deployment-scripts/.test/ps/main.test.bicep b/modules/resources/deployment-script/.test/ps/main.test.bicep similarity index 100% rename from modules/resources/deployment-scripts/.test/ps/main.test.bicep rename to modules/resources/deployment-script/.test/ps/main.test.bicep diff --git a/modules/resources/deployment-scripts/README.md b/modules/resources/deployment-script/README.md similarity index 98% rename from modules/resources/deployment-scripts/README.md rename to modules/resources/deployment-script/README.md index 9a74191bcd..d26d86e922 100644 --- a/modules/resources/deployment-scripts/README.md +++ b/modules/resources/deployment-script/README.md @@ -163,7 +163,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module deploymentScripts './resources/deployment-scripts/main.bicep' = { +module deploymentScripts './resources/deployment-script/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-rdscli' params: { // Required parameters @@ -284,7 +284,7 @@ module deploymentScripts './resources/deployment-scripts/main.bicep' = { via Bicep module ```bicep -module deploymentScripts './resources/deployment-scripts/main.bicep' = { +module deploymentScripts './resources/deployment-script/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-rdsps' params: { // Required parameters diff --git a/modules/resources/deployment-scripts/main.bicep b/modules/resources/deployment-script/main.bicep similarity index 100% rename from modules/resources/deployment-scripts/main.bicep rename to modules/resources/deployment-script/main.bicep diff --git a/modules/resources/deployment-scripts/main.json b/modules/resources/deployment-script/main.json similarity index 100% rename from modules/resources/deployment-scripts/main.json rename to modules/resources/deployment-script/main.json diff --git a/modules/resources/deployment-scripts/version.json b/modules/resources/deployment-script/version.json similarity index 100% rename from modules/resources/deployment-scripts/version.json rename to modules/resources/deployment-script/version.json diff --git a/modules/resources/resource-groups/.bicep/nested_roleAssignments.bicep b/modules/resources/resource-group/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/resources/resource-groups/.bicep/nested_roleAssignments.bicep rename to modules/resources/resource-group/.bicep/nested_roleAssignments.bicep diff --git a/modules/resources/resource-groups/.test/common/dependencies.bicep b/modules/resources/resource-group/.test/common/dependencies.bicep similarity index 100% rename from modules/resources/resource-groups/.test/common/dependencies.bicep rename to modules/resources/resource-group/.test/common/dependencies.bicep diff --git a/modules/resources/resource-groups/.test/common/main.test.bicep b/modules/resources/resource-group/.test/common/main.test.bicep similarity index 100% rename from modules/resources/resource-groups/.test/common/main.test.bicep rename to modules/resources/resource-group/.test/common/main.test.bicep diff --git a/modules/resources/resource-groups/.test/main.test.bicep b/modules/resources/resource-group/.test/main.test.bicep similarity index 100% rename from modules/resources/resource-groups/.test/main.test.bicep rename to modules/resources/resource-group/.test/main.test.bicep diff --git a/modules/resources/resource-groups/.test/min/main.test.bicep b/modules/resources/resource-group/.test/min/main.test.bicep similarity index 100% rename from modules/resources/resource-groups/.test/min/main.test.bicep rename to modules/resources/resource-group/.test/min/main.test.bicep diff --git a/modules/resources/resource-groups/README.md b/modules/resources/resource-group/README.md similarity index 98% rename from modules/resources/resource-groups/README.md rename to modules/resources/resource-group/README.md index 8db4643a7f..70f7addf64 100644 --- a/modules/resources/resource-groups/README.md +++ b/modules/resources/resource-group/README.md @@ -173,7 +173,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module resourceGroups './resources/resource-groups/main.bicep' = { +module resourceGroups './resources/resource-group/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-rrgcom' params: { // Required parameters @@ -252,7 +252,7 @@ module resourceGroups './resources/resource-groups/main.bicep' = { via Bicep module ```bicep -module resourceGroups './resources/resource-groups/main.bicep' = { +module resourceGroups './resources/resource-group/main.bicep' = { name: '${uniqueString(deployment().name)}-test-rrgmin' params: { // Required parameters diff --git a/modules/resources/resource-groups/main.bicep b/modules/resources/resource-group/main.bicep similarity index 96% rename from modules/resources/resource-groups/main.bicep rename to modules/resources/resource-group/main.bicep index 9b735fb307..c0a80d63de 100644 --- a/modules/resources/resource-groups/main.bicep +++ b/modules/resources/resource-group/main.bicep @@ -51,7 +51,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { properties: {} } -module resourceGroup_lock '../../authorization/locks/resource-group/main.bicep' = if (!empty(lock)) { +module resourceGroup_lock '../../authorization/lock/resource-group/main.bicep' = if (!empty(lock)) { name: '${uniqueString(deployment().name, location)}-${lock}-Lock' params: { level: any(lock) diff --git a/modules/resources/resource-groups/main.json b/modules/resources/resource-group/main.json similarity index 100% rename from modules/resources/resource-groups/main.json rename to modules/resources/resource-group/main.json diff --git a/modules/resources/resource-groups/version.json b/modules/resources/resource-group/version.json similarity index 100% rename from modules/resources/resource-groups/version.json rename to modules/resources/resource-group/version.json diff --git a/modules/resources/tags/main.bicep b/modules/resources/tags/main.bicep index 4920f6f878..83234e59f5 100644 --- a/modules/resources/tags/main.bicep +++ b/modules/resources/tags/main.bicep @@ -37,7 +37,7 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (ena } } -module tags_sub 'subscriptions/main.bicep' = if (!empty(subscriptionId) && empty(resourceGroupName)) { +module tags_sub 'subscription/main.bicep' = if (!empty(subscriptionId) && empty(resourceGroupName)) { name: '${deployment().name}-Tags-Sub' params: { onlyUpdate: onlyUpdate @@ -47,7 +47,7 @@ module tags_sub 'subscriptions/main.bicep' = if (!empty(subscriptionId) && empty } } -module tags_rg 'resource-groups/main.bicep' = if (!empty(resourceGroupName) && !empty(subscriptionId)) { +module tags_rg 'resource-group/main.bicep' = if (!empty(resourceGroupName) && !empty(subscriptionId)) { name: '${deployment().name}-Tags-RG' scope: resourceGroup(resourceGroupName) params: { diff --git a/modules/resources/tags/resource-groups/.bicep/readTags.bicep b/modules/resources/tags/resource-group/.bicep/readTags.bicep similarity index 100% rename from modules/resources/tags/resource-groups/.bicep/readTags.bicep rename to modules/resources/tags/resource-group/.bicep/readTags.bicep diff --git a/modules/resources/tags/resource-groups/README.md b/modules/resources/tags/resource-group/README.md similarity index 100% rename from modules/resources/tags/resource-groups/README.md rename to modules/resources/tags/resource-group/README.md diff --git a/modules/resources/tags/resource-groups/main.bicep b/modules/resources/tags/resource-group/main.bicep similarity index 100% rename from modules/resources/tags/resource-groups/main.bicep rename to modules/resources/tags/resource-group/main.bicep diff --git a/modules/resources/tags/resource-groups/main.json b/modules/resources/tags/resource-group/main.json similarity index 100% rename from modules/resources/tags/resource-groups/main.json rename to modules/resources/tags/resource-group/main.json diff --git a/modules/resources/tags/resource-groups/version.json b/modules/resources/tags/resource-group/version.json similarity index 100% rename from modules/resources/tags/resource-groups/version.json rename to modules/resources/tags/resource-group/version.json diff --git a/modules/resources/tags/subscriptions/.bicep/readTags.bicep b/modules/resources/tags/subscription/.bicep/readTags.bicep similarity index 100% rename from modules/resources/tags/subscriptions/.bicep/readTags.bicep rename to modules/resources/tags/subscription/.bicep/readTags.bicep diff --git a/modules/resources/tags/subscriptions/README.md b/modules/resources/tags/subscription/README.md similarity index 100% rename from modules/resources/tags/subscriptions/README.md rename to modules/resources/tags/subscription/README.md diff --git a/modules/resources/tags/subscriptions/main.bicep b/modules/resources/tags/subscription/main.bicep similarity index 100% rename from modules/resources/tags/subscriptions/main.bicep rename to modules/resources/tags/subscription/main.bicep diff --git a/modules/resources/tags/subscriptions/main.json b/modules/resources/tags/subscription/main.json similarity index 100% rename from modules/resources/tags/subscriptions/main.json rename to modules/resources/tags/subscription/main.json diff --git a/modules/resources/tags/subscriptions/version.json b/modules/resources/tags/subscription/version.json similarity index 100% rename from modules/resources/tags/subscriptions/version.json rename to modules/resources/tags/subscription/version.json diff --git a/modules/service-bus/namespaces/.bicep/nested_roleAssignments.bicep b/modules/service-bus/namespace/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/service-bus/namespaces/.bicep/nested_roleAssignments.bicep rename to modules/service-bus/namespace/.bicep/nested_roleAssignments.bicep diff --git a/modules/service-bus/namespaces/.test/common/dependencies.bicep b/modules/service-bus/namespace/.test/common/dependencies.bicep similarity index 100% rename from modules/service-bus/namespaces/.test/common/dependencies.bicep rename to modules/service-bus/namespace/.test/common/dependencies.bicep diff --git a/modules/service-bus/namespaces/.test/common/main.test.bicep b/modules/service-bus/namespace/.test/common/main.test.bicep similarity index 100% rename from modules/service-bus/namespaces/.test/common/main.test.bicep rename to modules/service-bus/namespace/.test/common/main.test.bicep diff --git a/modules/service-bus/namespaces/.test/encr/dependencies.bicep b/modules/service-bus/namespace/.test/encr/dependencies.bicep similarity index 100% rename from modules/service-bus/namespaces/.test/encr/dependencies.bicep rename to modules/service-bus/namespace/.test/encr/dependencies.bicep diff --git a/modules/service-bus/namespaces/.test/encr/main.test.bicep b/modules/service-bus/namespace/.test/encr/main.test.bicep similarity index 100% rename from modules/service-bus/namespaces/.test/encr/main.test.bicep rename to modules/service-bus/namespace/.test/encr/main.test.bicep diff --git a/modules/service-bus/namespaces/.test/main.test.bicep b/modules/service-bus/namespace/.test/main.test.bicep similarity index 100% rename from modules/service-bus/namespaces/.test/main.test.bicep rename to modules/service-bus/namespace/.test/main.test.bicep diff --git a/modules/service-bus/namespaces/.test/min/main.test.bicep b/modules/service-bus/namespace/.test/min/main.test.bicep similarity index 100% rename from modules/service-bus/namespaces/.test/min/main.test.bicep rename to modules/service-bus/namespace/.test/min/main.test.bicep diff --git a/modules/service-bus/namespaces/.test/pe/dependencies.bicep b/modules/service-bus/namespace/.test/pe/dependencies.bicep similarity index 100% rename from modules/service-bus/namespaces/.test/pe/dependencies.bicep rename to modules/service-bus/namespace/.test/pe/dependencies.bicep diff --git a/modules/service-bus/namespaces/.test/pe/main.test.bicep b/modules/service-bus/namespace/.test/pe/main.test.bicep similarity index 100% rename from modules/service-bus/namespaces/.test/pe/main.test.bicep rename to modules/service-bus/namespace/.test/pe/main.test.bicep diff --git a/modules/service-bus/namespaces/README.md b/modules/service-bus/namespace/README.md similarity index 99% rename from modules/service-bus/namespaces/README.md rename to modules/service-bus/namespace/README.md index 59227bbe12..eec2dfb5e4 100644 --- a/modules/service-bus/namespaces/README.md +++ b/modules/service-bus/namespace/README.md @@ -378,7 +378,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module namespaces './service-bus/namespaces/main.bicep' = { +module namespaces './service-bus/namespace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-sbncom' params: { // Required parameters @@ -731,7 +731,7 @@ module namespaces './service-bus/namespaces/main.bicep' = { via Bicep module ```bicep -module namespaces './service-bus/namespaces/main.bicep' = { +module namespaces './service-bus/namespace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-sbnencr' params: { // Required parameters @@ -912,7 +912,7 @@ module namespaces './service-bus/namespaces/main.bicep' = { via Bicep module ```bicep -module namespaces './service-bus/namespaces/main.bicep' = { +module namespaces './service-bus/namespace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-sbnmin' params: { // Required parameters @@ -957,7 +957,7 @@ module namespaces './service-bus/namespaces/main.bicep' = { via Bicep module ```bicep -module namespaces './service-bus/namespaces/main.bicep' = { +module namespaces './service-bus/namespace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-sbnpe' params: { // Required parameters diff --git a/modules/service-bus/namespaces/authorization-rules/README.md b/modules/service-bus/namespace/authorization-rules/README.md similarity index 100% rename from modules/service-bus/namespaces/authorization-rules/README.md rename to modules/service-bus/namespace/authorization-rules/README.md diff --git a/modules/service-bus/namespaces/authorization-rules/main.bicep b/modules/service-bus/namespace/authorization-rules/main.bicep similarity index 100% rename from modules/service-bus/namespaces/authorization-rules/main.bicep rename to modules/service-bus/namespace/authorization-rules/main.bicep diff --git a/modules/service-bus/namespaces/authorization-rules/main.json b/modules/service-bus/namespace/authorization-rules/main.json similarity index 100% rename from modules/service-bus/namespaces/authorization-rules/main.json rename to modules/service-bus/namespace/authorization-rules/main.json diff --git a/modules/service-bus/namespaces/authorization-rules/version.json b/modules/service-bus/namespace/authorization-rules/version.json similarity index 100% rename from modules/service-bus/namespaces/authorization-rules/version.json rename to modules/service-bus/namespace/authorization-rules/version.json diff --git a/modules/service-bus/namespaces/disaster-recovery-configs/README.md b/modules/service-bus/namespace/disaster-recovery-configs/README.md similarity index 100% rename from modules/service-bus/namespaces/disaster-recovery-configs/README.md rename to modules/service-bus/namespace/disaster-recovery-configs/README.md diff --git a/modules/service-bus/namespaces/disaster-recovery-configs/main.bicep b/modules/service-bus/namespace/disaster-recovery-configs/main.bicep similarity index 100% rename from modules/service-bus/namespaces/disaster-recovery-configs/main.bicep rename to modules/service-bus/namespace/disaster-recovery-configs/main.bicep diff --git a/modules/service-bus/namespaces/disaster-recovery-configs/main.json b/modules/service-bus/namespace/disaster-recovery-configs/main.json similarity index 100% rename from modules/service-bus/namespaces/disaster-recovery-configs/main.json rename to modules/service-bus/namespace/disaster-recovery-configs/main.json diff --git a/modules/service-bus/namespaces/disaster-recovery-configs/version.json b/modules/service-bus/namespace/disaster-recovery-configs/version.json similarity index 100% rename from modules/service-bus/namespaces/disaster-recovery-configs/version.json rename to modules/service-bus/namespace/disaster-recovery-configs/version.json diff --git a/modules/service-bus/namespaces/main.bicep b/modules/service-bus/namespace/main.bicep similarity index 96% rename from modules/service-bus/namespaces/main.bicep rename to modules/service-bus/namespace/main.bicep index a69adb229a..0745ab81fc 100644 --- a/modules/service-bus/namespaces/main.bicep +++ b/modules/service-bus/namespace/main.bicep @@ -214,7 +214,7 @@ resource serviceBusNamespace 'Microsoft.ServiceBus/namespaces@2021-11-01' = { } } -module serviceBusNamespace_authorizationRules 'authorization-rules/main.bicep' = [for (authorizationRule, index) in authorizationRules: { +module serviceBusNamespace_authorizationRules 'authorization-rule/main.bicep' = [for (authorizationRule, index) in authorizationRules: { name: '${uniqueString(deployment().name, location)}-AuthorizationRules-${index}' params: { namespaceName: serviceBusNamespace.name @@ -224,7 +224,7 @@ module serviceBusNamespace_authorizationRules 'authorization-rules/main.bicep' = } }] -module serviceBusNamespace_disasterRecoveryConfig 'disaster-recovery-configs/main.bicep' = if (!empty(disasterRecoveryConfigs)) { +module serviceBusNamespace_disasterRecoveryConfig 'disaster-recovery-config/main.bicep' = if (!empty(disasterRecoveryConfigs)) { name: '${uniqueString(deployment().name, location)}-DisasterRecoveryConfig' params: { namespaceName: serviceBusNamespace.name @@ -235,7 +235,7 @@ module serviceBusNamespace_disasterRecoveryConfig 'disaster-recovery-configs/mai } } -module serviceBusNamespace_migrationConfigurations 'migration-configurations/main.bicep' = if (!empty(migrationConfigurations)) { +module serviceBusNamespace_migrationConfigurations 'migration-configuration/main.bicep' = if (!empty(migrationConfigurations)) { name: '${uniqueString(deployment().name, location)}-MigrationConfigurations' params: { namespaceName: serviceBusNamespace.name @@ -245,7 +245,7 @@ module serviceBusNamespace_migrationConfigurations 'migration-configurations/mai } } -module serviceBusNamespace_networkRuleSet 'network-rule-sets/main.bicep' = if (!empty(networkRuleSets) || !empty(privateEndpoints)) { +module serviceBusNamespace_networkRuleSet 'network-rule-set/main.bicep' = if (!empty(networkRuleSets) || !empty(privateEndpoints)) { name: '${uniqueString(deployment().name, location)}-NetworkRuleSet' params: { namespaceName: serviceBusNamespace.name @@ -258,7 +258,7 @@ module serviceBusNamespace_networkRuleSet 'network-rule-sets/main.bicep' = if (! } } -module serviceBusNamespace_queues 'queues/main.bicep' = [for (queue, index) in queues: { +module serviceBusNamespace_queues 'queue/main.bicep' = [for (queue, index) in queues: { name: '${uniqueString(deployment().name, location)}-Queue-${index}' params: { namespaceName: serviceBusNamespace.name @@ -291,7 +291,7 @@ module serviceBusNamespace_queues 'queues/main.bicep' = [for (queue, index) in q } }] -module serviceBusNamespace_topics 'topics/main.bicep' = [for (topic, index) in topics: { +module serviceBusNamespace_topics 'topic/main.bicep' = [for (topic, index) in topics: { name: '${uniqueString(deployment().name, location)}-Topic-${index}' params: { namespaceName: serviceBusNamespace.name @@ -345,7 +345,7 @@ resource serviceBusNamespace_diagnosticSettings 'Microsoft.Insights/diagnosticSe scope: serviceBusNamespace } -module serviceBusNamespace_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module serviceBusNamespace_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-Namespace-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/service-bus/namespaces/main.json b/modules/service-bus/namespace/main.json similarity index 100% rename from modules/service-bus/namespaces/main.json rename to modules/service-bus/namespace/main.json diff --git a/modules/service-bus/namespaces/migration-configurations/README.md b/modules/service-bus/namespace/migration-configurations/README.md similarity index 100% rename from modules/service-bus/namespaces/migration-configurations/README.md rename to modules/service-bus/namespace/migration-configurations/README.md diff --git a/modules/service-bus/namespaces/migration-configurations/main.bicep b/modules/service-bus/namespace/migration-configurations/main.bicep similarity index 100% rename from modules/service-bus/namespaces/migration-configurations/main.bicep rename to modules/service-bus/namespace/migration-configurations/main.bicep diff --git a/modules/service-bus/namespaces/migration-configurations/main.json b/modules/service-bus/namespace/migration-configurations/main.json similarity index 100% rename from modules/service-bus/namespaces/migration-configurations/main.json rename to modules/service-bus/namespace/migration-configurations/main.json diff --git a/modules/service-bus/namespaces/migration-configurations/version.json b/modules/service-bus/namespace/migration-configurations/version.json similarity index 100% rename from modules/service-bus/namespaces/migration-configurations/version.json rename to modules/service-bus/namespace/migration-configurations/version.json diff --git a/modules/service-bus/namespaces/network-rule-sets/README.md b/modules/service-bus/namespace/network-rule-sets/README.md similarity index 100% rename from modules/service-bus/namespaces/network-rule-sets/README.md rename to modules/service-bus/namespace/network-rule-sets/README.md diff --git a/modules/service-bus/namespaces/network-rule-sets/main.bicep b/modules/service-bus/namespace/network-rule-sets/main.bicep similarity index 100% rename from modules/service-bus/namespaces/network-rule-sets/main.bicep rename to modules/service-bus/namespace/network-rule-sets/main.bicep diff --git a/modules/service-bus/namespaces/network-rule-sets/main.json b/modules/service-bus/namespace/network-rule-sets/main.json similarity index 100% rename from modules/service-bus/namespaces/network-rule-sets/main.json rename to modules/service-bus/namespace/network-rule-sets/main.json diff --git a/modules/service-bus/namespaces/network-rule-sets/version.json b/modules/service-bus/namespace/network-rule-sets/version.json similarity index 100% rename from modules/service-bus/namespaces/network-rule-sets/version.json rename to modules/service-bus/namespace/network-rule-sets/version.json diff --git a/modules/service-bus/namespaces/queues/.bicep/nested_roleAssignments.bicep b/modules/service-bus/namespace/queues/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/service-bus/namespaces/queues/.bicep/nested_roleAssignments.bicep rename to modules/service-bus/namespace/queues/.bicep/nested_roleAssignments.bicep diff --git a/modules/service-bus/namespaces/queues/README.md b/modules/service-bus/namespace/queues/README.md similarity index 100% rename from modules/service-bus/namespaces/queues/README.md rename to modules/service-bus/namespace/queues/README.md diff --git a/modules/service-bus/namespaces/queues/authorization-rules/README.md b/modules/service-bus/namespace/queues/authorization-rules/README.md similarity index 100% rename from modules/service-bus/namespaces/queues/authorization-rules/README.md rename to modules/service-bus/namespace/queues/authorization-rules/README.md diff --git a/modules/service-bus/namespaces/queues/authorization-rules/main.bicep b/modules/service-bus/namespace/queues/authorization-rules/main.bicep similarity index 100% rename from modules/service-bus/namespaces/queues/authorization-rules/main.bicep rename to modules/service-bus/namespace/queues/authorization-rules/main.bicep diff --git a/modules/service-bus/namespaces/queues/authorization-rules/main.json b/modules/service-bus/namespace/queues/authorization-rules/main.json similarity index 100% rename from modules/service-bus/namespaces/queues/authorization-rules/main.json rename to modules/service-bus/namespace/queues/authorization-rules/main.json diff --git a/modules/service-bus/namespaces/queues/authorization-rules/version.json b/modules/service-bus/namespace/queues/authorization-rules/version.json similarity index 100% rename from modules/service-bus/namespaces/queues/authorization-rules/version.json rename to modules/service-bus/namespace/queues/authorization-rules/version.json diff --git a/modules/service-bus/namespaces/queues/main.bicep b/modules/service-bus/namespace/queues/main.bicep similarity index 98% rename from modules/service-bus/namespaces/queues/main.bicep rename to modules/service-bus/namespace/queues/main.bicep index fc08620ac9..cd75b97337 100644 --- a/modules/service-bus/namespaces/queues/main.bicep +++ b/modules/service-bus/namespace/queues/main.bicep @@ -124,7 +124,7 @@ resource queue 'Microsoft.ServiceBus/namespaces/queues@2021-06-01-preview' = { } } -module queue_authorizationRules 'authorization-rules/main.bicep' = [for (authorizationRule, index) in authorizationRules: { +module queue_authorizationRules 'authorization-rule/main.bicep' = [for (authorizationRule, index) in authorizationRules: { name: '${deployment().name}-AuthRule-${index}' params: { namespaceName: namespaceName diff --git a/modules/service-bus/namespaces/queues/main.json b/modules/service-bus/namespace/queues/main.json similarity index 100% rename from modules/service-bus/namespaces/queues/main.json rename to modules/service-bus/namespace/queues/main.json diff --git a/modules/service-bus/namespaces/queues/version.json b/modules/service-bus/namespace/queues/version.json similarity index 100% rename from modules/service-bus/namespaces/queues/version.json rename to modules/service-bus/namespace/queues/version.json diff --git a/modules/service-bus/namespaces/topics/.bicep/nested_roleAssignments.bicep b/modules/service-bus/namespace/topics/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/service-bus/namespaces/topics/.bicep/nested_roleAssignments.bicep rename to modules/service-bus/namespace/topics/.bicep/nested_roleAssignments.bicep diff --git a/modules/service-bus/namespaces/topics/README.md b/modules/service-bus/namespace/topics/README.md similarity index 100% rename from modules/service-bus/namespaces/topics/README.md rename to modules/service-bus/namespace/topics/README.md diff --git a/modules/service-bus/namespaces/topics/authorization-rules/README.md b/modules/service-bus/namespace/topics/authorization-rules/README.md similarity index 100% rename from modules/service-bus/namespaces/topics/authorization-rules/README.md rename to modules/service-bus/namespace/topics/authorization-rules/README.md diff --git a/modules/service-bus/namespaces/topics/authorization-rules/main.bicep b/modules/service-bus/namespace/topics/authorization-rules/main.bicep similarity index 100% rename from modules/service-bus/namespaces/topics/authorization-rules/main.bicep rename to modules/service-bus/namespace/topics/authorization-rules/main.bicep diff --git a/modules/service-bus/namespaces/topics/authorization-rules/main.json b/modules/service-bus/namespace/topics/authorization-rules/main.json similarity index 100% rename from modules/service-bus/namespaces/topics/authorization-rules/main.json rename to modules/service-bus/namespace/topics/authorization-rules/main.json diff --git a/modules/service-bus/namespaces/topics/authorization-rules/version.json b/modules/service-bus/namespace/topics/authorization-rules/version.json similarity index 100% rename from modules/service-bus/namespaces/topics/authorization-rules/version.json rename to modules/service-bus/namespace/topics/authorization-rules/version.json diff --git a/modules/service-bus/namespaces/topics/main.bicep b/modules/service-bus/namespace/topics/main.bicep similarity index 98% rename from modules/service-bus/namespaces/topics/main.bicep rename to modules/service-bus/namespace/topics/main.bicep index db27982679..84036320fb 100644 --- a/modules/service-bus/namespaces/topics/main.bicep +++ b/modules/service-bus/namespace/topics/main.bicep @@ -120,7 +120,7 @@ resource topic 'Microsoft.ServiceBus/namespaces/topics@2021-06-01-preview' = { } } -module topic_authorizationRules 'authorization-rules/main.bicep' = [for (authorizationRule, index) in authorizationRules: { +module topic_authorizationRules 'authorization-rule/main.bicep' = [for (authorizationRule, index) in authorizationRules: { name: '${deployment().name}-AuthRule-${index}' params: { namespaceName: namespaceName diff --git a/modules/service-bus/namespaces/topics/main.json b/modules/service-bus/namespace/topics/main.json similarity index 100% rename from modules/service-bus/namespaces/topics/main.json rename to modules/service-bus/namespace/topics/main.json diff --git a/modules/service-bus/namespaces/topics/version.json b/modules/service-bus/namespace/topics/version.json similarity index 100% rename from modules/service-bus/namespaces/topics/version.json rename to modules/service-bus/namespace/topics/version.json diff --git a/modules/service-bus/namespaces/version.json b/modules/service-bus/namespace/version.json similarity index 100% rename from modules/service-bus/namespaces/version.json rename to modules/service-bus/namespace/version.json diff --git a/modules/service-fabric/clusters/.bicep/nested_roleAssignments.bicep b/modules/service-fabric/cluster/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/service-fabric/clusters/.bicep/nested_roleAssignments.bicep rename to modules/service-fabric/cluster/.bicep/nested_roleAssignments.bicep diff --git a/modules/service-fabric/clusters/.test/cert/main.test.bicep b/modules/service-fabric/cluster/.test/cert/main.test.bicep similarity index 100% rename from modules/service-fabric/clusters/.test/cert/main.test.bicep rename to modules/service-fabric/cluster/.test/cert/main.test.bicep diff --git a/modules/service-fabric/clusters/.test/common/dependencies.bicep b/modules/service-fabric/cluster/.test/common/dependencies.bicep similarity index 100% rename from modules/service-fabric/clusters/.test/common/dependencies.bicep rename to modules/service-fabric/cluster/.test/common/dependencies.bicep diff --git a/modules/service-fabric/clusters/.test/common/main.test.bicep b/modules/service-fabric/cluster/.test/common/main.test.bicep similarity index 100% rename from modules/service-fabric/clusters/.test/common/main.test.bicep rename to modules/service-fabric/cluster/.test/common/main.test.bicep diff --git a/modules/service-fabric/clusters/.test/main.test.bicep b/modules/service-fabric/cluster/.test/main.test.bicep similarity index 100% rename from modules/service-fabric/clusters/.test/main.test.bicep rename to modules/service-fabric/cluster/.test/main.test.bicep diff --git a/modules/service-fabric/clusters/.test/min/main.test.bicep b/modules/service-fabric/cluster/.test/min/main.test.bicep similarity index 100% rename from modules/service-fabric/clusters/.test/min/main.test.bicep rename to modules/service-fabric/cluster/.test/min/main.test.bicep diff --git a/modules/service-fabric/clusters/README.md b/modules/service-fabric/cluster/README.md similarity index 99% rename from modules/service-fabric/clusters/README.md rename to modules/service-fabric/cluster/README.md index 3c9d865c79..4f9af070d5 100644 --- a/modules/service-fabric/clusters/README.md +++ b/modules/service-fabric/cluster/README.md @@ -247,7 +247,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module clusters './service-fabric/clusters/main.bicep' = { +module clusters './service-fabric/cluster/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-sfccer' params: { // Required parameters @@ -356,7 +356,7 @@ module clusters './service-fabric/clusters/main.bicep' = { via Bicep module ```bicep -module clusters './service-fabric/clusters/main.bicep' = { +module clusters './service-fabric/cluster/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-sfccom' params: { // Required parameters @@ -763,7 +763,7 @@ module clusters './service-fabric/clusters/main.bicep' = { via Bicep module ```bicep -module clusters './service-fabric/clusters/main.bicep' = { +module clusters './service-fabric/cluster/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-sfcmin' params: { // Required parameters diff --git a/modules/service-fabric/clusters/application-types/README.md b/modules/service-fabric/cluster/application-types/README.md similarity index 100% rename from modules/service-fabric/clusters/application-types/README.md rename to modules/service-fabric/cluster/application-types/README.md diff --git a/modules/service-fabric/clusters/application-types/main.bicep b/modules/service-fabric/cluster/application-types/main.bicep similarity index 100% rename from modules/service-fabric/clusters/application-types/main.bicep rename to modules/service-fabric/cluster/application-types/main.bicep diff --git a/modules/service-fabric/clusters/application-types/main.json b/modules/service-fabric/cluster/application-types/main.json similarity index 100% rename from modules/service-fabric/clusters/application-types/main.json rename to modules/service-fabric/cluster/application-types/main.json diff --git a/modules/service-fabric/clusters/application-types/version.json b/modules/service-fabric/cluster/application-types/version.json similarity index 100% rename from modules/service-fabric/clusters/application-types/version.json rename to modules/service-fabric/cluster/application-types/version.json diff --git a/modules/service-fabric/clusters/main.bicep b/modules/service-fabric/cluster/main.bicep similarity index 99% rename from modules/service-fabric/clusters/main.bicep rename to modules/service-fabric/cluster/main.bicep index 3891039a44..3cf80e1cb6 100644 --- a/modules/service-fabric/clusters/main.bicep +++ b/modules/service-fabric/cluster/main.bicep @@ -308,7 +308,7 @@ module serviceFabricCluster_roleAssignments '.bicep/nested_roleAssignments.bicep }] // Service Fabric cluster application types -module serviceFabricCluster_applicationTypes 'application-types/main.bicep' = [for applicationType in applicationTypes: { +module serviceFabricCluster_applicationTypes 'application-type/main.bicep' = [for applicationType in applicationTypes: { name: '${uniqueString(deployment().name, location)}-SFC-${applicationType.name}' params: { name: applicationType.name diff --git a/modules/service-fabric/clusters/main.json b/modules/service-fabric/cluster/main.json similarity index 100% rename from modules/service-fabric/clusters/main.json rename to modules/service-fabric/cluster/main.json diff --git a/modules/service-fabric/clusters/version.json b/modules/service-fabric/cluster/version.json similarity index 100% rename from modules/service-fabric/clusters/version.json rename to modules/service-fabric/cluster/version.json diff --git a/modules/signal-r-service/signal-r/main.bicep b/modules/signal-r-service/signal-r/main.bicep index 5569f45c34..c5139f09a0 100644 --- a/modules/signal-r-service/signal-r/main.bicep +++ b/modules/signal-r-service/signal-r/main.bicep @@ -162,7 +162,7 @@ resource signalR 'Microsoft.SignalRService/signalR@2022-02-01' = { } } -module signalR_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module signalR_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-SignalR-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/signal-r-service/web-pub-sub/main.bicep b/modules/signal-r-service/web-pub-sub/main.bicep index 52e6c3bc66..78d5e85d14 100644 --- a/modules/signal-r-service/web-pub-sub/main.bicep +++ b/modules/signal-r-service/web-pub-sub/main.bicep @@ -122,7 +122,7 @@ resource webPubSub 'Microsoft.SignalRService/webPubSub@2021-10-01' = { } } -module webPubSub_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module webPubSub_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-WebPubSub-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/sql/managed-instances/.bicep/nested_roleAssignments.bicep b/modules/sql/managed-instance/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/sql/managed-instances/.bicep/nested_roleAssignments.bicep rename to modules/sql/managed-instance/.bicep/nested_roleAssignments.bicep diff --git a/modules/sql/managed-instances/.test/common/dependencies.bicep b/modules/sql/managed-instance/.test/common/dependencies.bicep similarity index 100% rename from modules/sql/managed-instances/.test/common/dependencies.bicep rename to modules/sql/managed-instance/.test/common/dependencies.bicep diff --git a/modules/sql/managed-instances/.test/common/main.test.bicep b/modules/sql/managed-instance/.test/common/main.test.bicep similarity index 100% rename from modules/sql/managed-instances/.test/common/main.test.bicep rename to modules/sql/managed-instance/.test/common/main.test.bicep diff --git a/modules/sql/managed-instances/.test/main.test.bicep b/modules/sql/managed-instance/.test/main.test.bicep similarity index 100% rename from modules/sql/managed-instances/.test/main.test.bicep rename to modules/sql/managed-instance/.test/main.test.bicep diff --git a/modules/sql/managed-instances/.test/min/dependencies.bicep b/modules/sql/managed-instance/.test/min/dependencies.bicep similarity index 100% rename from modules/sql/managed-instances/.test/min/dependencies.bicep rename to modules/sql/managed-instance/.test/min/dependencies.bicep diff --git a/modules/sql/managed-instances/.test/min/main.test.bicep b/modules/sql/managed-instance/.test/min/main.test.bicep similarity index 100% rename from modules/sql/managed-instances/.test/min/main.test.bicep rename to modules/sql/managed-instance/.test/min/main.test.bicep diff --git a/modules/sql/managed-instances/README.md b/modules/sql/managed-instance/README.md similarity index 99% rename from modules/sql/managed-instances/README.md rename to modules/sql/managed-instance/README.md index 786c3c15db..1755589268 100644 --- a/modules/sql/managed-instances/README.md +++ b/modules/sql/managed-instance/README.md @@ -295,7 +295,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module managedInstances './sql/managed-instances/main.bicep' = { +module managedInstances './sql/managed-instance/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-sqlmicom' params: { administratorLogin: 'adminUserName' @@ -546,7 +546,7 @@ module managedInstances './sql/managed-instances/main.bicep' = { via Bicep module ```bicep -module managedInstances './sql/managed-instances/main.bicep' = { +module managedInstances './sql/managed-instance/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-sqlmimin' params: { // Required parameters diff --git a/modules/sql/managed-instances/administrators/README.md b/modules/sql/managed-instance/administrators/README.md similarity index 100% rename from modules/sql/managed-instances/administrators/README.md rename to modules/sql/managed-instance/administrators/README.md diff --git a/modules/sql/managed-instances/administrators/main.bicep b/modules/sql/managed-instance/administrators/main.bicep similarity index 100% rename from modules/sql/managed-instances/administrators/main.bicep rename to modules/sql/managed-instance/administrators/main.bicep diff --git a/modules/sql/managed-instances/administrators/main.json b/modules/sql/managed-instance/administrators/main.json similarity index 100% rename from modules/sql/managed-instances/administrators/main.json rename to modules/sql/managed-instance/administrators/main.json diff --git a/modules/sql/managed-instances/administrators/version.json b/modules/sql/managed-instance/administrators/version.json similarity index 100% rename from modules/sql/managed-instances/administrators/version.json rename to modules/sql/managed-instance/administrators/version.json diff --git a/modules/sql/managed-instances/databases/README.md b/modules/sql/managed-instance/databases/README.md similarity index 100% rename from modules/sql/managed-instances/databases/README.md rename to modules/sql/managed-instance/databases/README.md diff --git a/modules/sql/managed-instances/databases/backup-long-term-retention-policies/README.md b/modules/sql/managed-instance/databases/backup-long-term-retention-policies/README.md similarity index 100% rename from modules/sql/managed-instances/databases/backup-long-term-retention-policies/README.md rename to modules/sql/managed-instance/databases/backup-long-term-retention-policies/README.md diff --git a/modules/sql/managed-instances/databases/backup-long-term-retention-policies/main.bicep b/modules/sql/managed-instance/databases/backup-long-term-retention-policies/main.bicep similarity index 100% rename from modules/sql/managed-instances/databases/backup-long-term-retention-policies/main.bicep rename to modules/sql/managed-instance/databases/backup-long-term-retention-policies/main.bicep diff --git a/modules/sql/managed-instances/databases/backup-long-term-retention-policies/main.json b/modules/sql/managed-instance/databases/backup-long-term-retention-policies/main.json similarity index 100% rename from modules/sql/managed-instances/databases/backup-long-term-retention-policies/main.json rename to modules/sql/managed-instance/databases/backup-long-term-retention-policies/main.json diff --git a/modules/sql/managed-instances/databases/backup-long-term-retention-policies/version.json b/modules/sql/managed-instance/databases/backup-long-term-retention-policies/version.json similarity index 100% rename from modules/sql/managed-instances/databases/backup-long-term-retention-policies/version.json rename to modules/sql/managed-instance/databases/backup-long-term-retention-policies/version.json diff --git a/modules/sql/managed-instances/databases/backup-short-term-retention-policies/README.md b/modules/sql/managed-instance/databases/backup-short-term-retention-policies/README.md similarity index 100% rename from modules/sql/managed-instances/databases/backup-short-term-retention-policies/README.md rename to modules/sql/managed-instance/databases/backup-short-term-retention-policies/README.md diff --git a/modules/sql/managed-instances/databases/backup-short-term-retention-policies/main.bicep b/modules/sql/managed-instance/databases/backup-short-term-retention-policies/main.bicep similarity index 100% rename from modules/sql/managed-instances/databases/backup-short-term-retention-policies/main.bicep rename to modules/sql/managed-instance/databases/backup-short-term-retention-policies/main.bicep diff --git a/modules/sql/managed-instances/databases/backup-short-term-retention-policies/main.json b/modules/sql/managed-instance/databases/backup-short-term-retention-policies/main.json similarity index 100% rename from modules/sql/managed-instances/databases/backup-short-term-retention-policies/main.json rename to modules/sql/managed-instance/databases/backup-short-term-retention-policies/main.json diff --git a/modules/sql/managed-instances/databases/backup-short-term-retention-policies/version.json b/modules/sql/managed-instance/databases/backup-short-term-retention-policies/version.json similarity index 100% rename from modules/sql/managed-instances/databases/backup-short-term-retention-policies/version.json rename to modules/sql/managed-instance/databases/backup-short-term-retention-policies/version.json diff --git a/modules/sql/managed-instances/databases/main.bicep b/modules/sql/managed-instance/databases/main.bicep similarity index 98% rename from modules/sql/managed-instances/databases/main.bicep rename to modules/sql/managed-instance/databases/main.bicep index 50618046fc..0d7e0385f4 100644 --- a/modules/sql/managed-instances/databases/main.bicep +++ b/modules/sql/managed-instance/databases/main.bicep @@ -179,7 +179,7 @@ resource database_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@2021 scope: database } -module database_backupShortTermRetentionPolicy 'backup-short-term-retention-policies/main.bicep' = if (!empty(backupShortTermRetentionPoliciesObj)) { +module database_backupShortTermRetentionPolicy 'backup-short-term-retention-policy/main.bicep' = if (!empty(backupShortTermRetentionPoliciesObj)) { name: '${deployment().name}-BackupShortTRetPol' params: { managedInstanceName: managedInstanceName @@ -190,7 +190,7 @@ module database_backupShortTermRetentionPolicy 'backup-short-term-retention-poli } } -module database_backupLongTermRetentionPolicy 'backup-long-term-retention-policies/main.bicep' = if (!empty(backupLongTermRetentionPoliciesObj)) { +module database_backupLongTermRetentionPolicy 'backup-long-term-retention-policy/main.bicep' = if (!empty(backupLongTermRetentionPoliciesObj)) { name: '${deployment().name}-BackupLongTRetPol' params: { managedInstanceName: managedInstanceName diff --git a/modules/sql/managed-instances/databases/main.json b/modules/sql/managed-instance/databases/main.json similarity index 100% rename from modules/sql/managed-instances/databases/main.json rename to modules/sql/managed-instance/databases/main.json diff --git a/modules/sql/managed-instances/databases/version.json b/modules/sql/managed-instance/databases/version.json similarity index 100% rename from modules/sql/managed-instances/databases/version.json rename to modules/sql/managed-instance/databases/version.json diff --git a/modules/sql/managed-instances/encryption-protector/README.md b/modules/sql/managed-instance/encryption-protector/README.md similarity index 100% rename from modules/sql/managed-instances/encryption-protector/README.md rename to modules/sql/managed-instance/encryption-protector/README.md diff --git a/modules/sql/managed-instances/encryption-protector/main.bicep b/modules/sql/managed-instance/encryption-protector/main.bicep similarity index 100% rename from modules/sql/managed-instances/encryption-protector/main.bicep rename to modules/sql/managed-instance/encryption-protector/main.bicep diff --git a/modules/sql/managed-instances/encryption-protector/main.json b/modules/sql/managed-instance/encryption-protector/main.json similarity index 100% rename from modules/sql/managed-instances/encryption-protector/main.json rename to modules/sql/managed-instance/encryption-protector/main.json diff --git a/modules/sql/managed-instances/encryption-protector/version.json b/modules/sql/managed-instance/encryption-protector/version.json similarity index 100% rename from modules/sql/managed-instances/encryption-protector/version.json rename to modules/sql/managed-instance/encryption-protector/version.json diff --git a/modules/sql/managed-instances/keys/README.md b/modules/sql/managed-instance/keys/README.md similarity index 100% rename from modules/sql/managed-instances/keys/README.md rename to modules/sql/managed-instance/keys/README.md diff --git a/modules/sql/managed-instances/keys/main.bicep b/modules/sql/managed-instance/keys/main.bicep similarity index 100% rename from modules/sql/managed-instances/keys/main.bicep rename to modules/sql/managed-instance/keys/main.bicep diff --git a/modules/sql/managed-instances/keys/main.json b/modules/sql/managed-instance/keys/main.json similarity index 100% rename from modules/sql/managed-instances/keys/main.json rename to modules/sql/managed-instance/keys/main.json diff --git a/modules/sql/managed-instances/keys/version.json b/modules/sql/managed-instance/keys/version.json similarity index 100% rename from modules/sql/managed-instances/keys/version.json rename to modules/sql/managed-instance/keys/version.json diff --git a/modules/sql/managed-instances/main.bicep b/modules/sql/managed-instance/main.bicep similarity index 97% rename from modules/sql/managed-instances/main.bicep rename to modules/sql/managed-instance/main.bicep index 8610f56417..8c6cde5714 100644 --- a/modules/sql/managed-instances/main.bicep +++ b/modules/sql/managed-instance/main.bicep @@ -309,7 +309,7 @@ module managedInstance_roleAssignments '.bicep/nested_roleAssignments.bicep' = [ } }] -module managedInstance_databases 'databases/main.bicep' = [for (database, index) in databases: { +module managedInstance_databases 'database/main.bicep' = [for (database, index) in databases: { name: '${uniqueString(deployment().name, location)}-SqlMi-DB-${index}' params: { name: database.name @@ -338,7 +338,7 @@ module managedInstance_databases 'databases/main.bicep' = [for (database, index) } }] -module managedInstance_securityAlertPolicy 'security-alert-policies/main.bicep' = if (!empty(securityAlertPoliciesObj)) { +module managedInstance_securityAlertPolicy 'security-alert-policy/main.bicep' = if (!empty(securityAlertPoliciesObj)) { name: '${uniqueString(deployment().name, location)}-SqlMi-SecAlertPol' params: { managedInstanceName: managedInstance.name @@ -349,7 +349,7 @@ module managedInstance_securityAlertPolicy 'security-alert-policies/main.bicep' } } -module managedInstance_vulnerabilityAssessment 'vulnerability-assessments/main.bicep' = if (!empty(vulnerabilityAssessmentsObj)) { +module managedInstance_vulnerabilityAssessment 'vulnerability-assessment/main.bicep' = if (!empty(vulnerabilityAssessmentsObj)) { name: '${uniqueString(deployment().name, location)}-SqlMi-VulnAssessm' params: { managedInstanceName: managedInstance.name @@ -365,7 +365,7 @@ module managedInstance_vulnerabilityAssessment 'vulnerability-assessments/main.b ] } -module managedInstance_keys 'keys/main.bicep' = [for (key, index) in keys: { +module managedInstance_keys 'key/main.bicep' = [for (key, index) in keys: { name: '${uniqueString(deployment().name, location)}-SqlMi-Key-${index}' params: { name: key.name @@ -390,7 +390,7 @@ module managedInstance_encryptionProtector 'encryption-protector/main.bicep' = i ] } -module managedInstance_administrator 'administrators/main.bicep' = if (!empty(administratorsObj)) { +module managedInstance_administrator 'administrator/main.bicep' = if (!empty(administratorsObj)) { name: '${uniqueString(deployment().name, location)}-SqlMi-Admin' params: { managedInstanceName: managedInstance.name diff --git a/modules/sql/managed-instances/main.json b/modules/sql/managed-instance/main.json similarity index 100% rename from modules/sql/managed-instances/main.json rename to modules/sql/managed-instance/main.json diff --git a/modules/sql/managed-instances/security-alert-policies/README.md b/modules/sql/managed-instance/security-alert-policies/README.md similarity index 100% rename from modules/sql/managed-instances/security-alert-policies/README.md rename to modules/sql/managed-instance/security-alert-policies/README.md diff --git a/modules/sql/managed-instances/security-alert-policies/main.bicep b/modules/sql/managed-instance/security-alert-policies/main.bicep similarity index 100% rename from modules/sql/managed-instances/security-alert-policies/main.bicep rename to modules/sql/managed-instance/security-alert-policies/main.bicep diff --git a/modules/sql/managed-instances/security-alert-policies/main.json b/modules/sql/managed-instance/security-alert-policies/main.json similarity index 100% rename from modules/sql/managed-instances/security-alert-policies/main.json rename to modules/sql/managed-instance/security-alert-policies/main.json diff --git a/modules/sql/managed-instances/security-alert-policies/version.json b/modules/sql/managed-instance/security-alert-policies/version.json similarity index 100% rename from modules/sql/managed-instances/security-alert-policies/version.json rename to modules/sql/managed-instance/security-alert-policies/version.json diff --git a/modules/sql/managed-instances/version.json b/modules/sql/managed-instance/version.json similarity index 100% rename from modules/sql/managed-instances/version.json rename to modules/sql/managed-instance/version.json diff --git a/modules/sql/managed-instances/vulnerability-assessments/README.md b/modules/sql/managed-instance/vulnerability-assessments/README.md similarity index 100% rename from modules/sql/managed-instances/vulnerability-assessments/README.md rename to modules/sql/managed-instance/vulnerability-assessments/README.md diff --git a/modules/sql/managed-instances/vulnerability-assessments/main.bicep b/modules/sql/managed-instance/vulnerability-assessments/main.bicep similarity index 100% rename from modules/sql/managed-instances/vulnerability-assessments/main.bicep rename to modules/sql/managed-instance/vulnerability-assessments/main.bicep diff --git a/modules/sql/managed-instances/vulnerability-assessments/main.json b/modules/sql/managed-instance/vulnerability-assessments/main.json similarity index 100% rename from modules/sql/managed-instances/vulnerability-assessments/main.json rename to modules/sql/managed-instance/vulnerability-assessments/main.json diff --git a/modules/sql/managed-instances/vulnerability-assessments/version.json b/modules/sql/managed-instance/vulnerability-assessments/version.json similarity index 100% rename from modules/sql/managed-instances/vulnerability-assessments/version.json rename to modules/sql/managed-instance/vulnerability-assessments/version.json diff --git a/modules/sql/servers/.bicep/nested_roleAssignments.bicep b/modules/sql/server/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/sql/servers/.bicep/nested_roleAssignments.bicep rename to modules/sql/server/.bicep/nested_roleAssignments.bicep diff --git a/modules/sql/servers/.test/admin/dependencies.bicep b/modules/sql/server/.test/admin/dependencies.bicep similarity index 100% rename from modules/sql/servers/.test/admin/dependencies.bicep rename to modules/sql/server/.test/admin/dependencies.bicep diff --git a/modules/sql/servers/.test/admin/main.test.bicep b/modules/sql/server/.test/admin/main.test.bicep similarity index 100% rename from modules/sql/servers/.test/admin/main.test.bicep rename to modules/sql/server/.test/admin/main.test.bicep diff --git a/modules/sql/servers/.test/common/dependencies.bicep b/modules/sql/server/.test/common/dependencies.bicep similarity index 100% rename from modules/sql/servers/.test/common/dependencies.bicep rename to modules/sql/server/.test/common/dependencies.bicep diff --git a/modules/sql/servers/.test/common/main.test.bicep b/modules/sql/server/.test/common/main.test.bicep similarity index 100% rename from modules/sql/servers/.test/common/main.test.bicep rename to modules/sql/server/.test/common/main.test.bicep diff --git a/modules/sql/servers/.test/main.test.bicep b/modules/sql/server/.test/main.test.bicep similarity index 100% rename from modules/sql/servers/.test/main.test.bicep rename to modules/sql/server/.test/main.test.bicep diff --git a/modules/sql/servers/.test/pe/dependencies.bicep b/modules/sql/server/.test/pe/dependencies.bicep similarity index 100% rename from modules/sql/servers/.test/pe/dependencies.bicep rename to modules/sql/server/.test/pe/dependencies.bicep diff --git a/modules/sql/servers/.test/pe/main.test.bicep b/modules/sql/server/.test/pe/main.test.bicep similarity index 100% rename from modules/sql/servers/.test/pe/main.test.bicep rename to modules/sql/server/.test/pe/main.test.bicep diff --git a/modules/sql/servers/.test/secondary/dependencies.bicep b/modules/sql/server/.test/secondary/dependencies.bicep similarity index 100% rename from modules/sql/servers/.test/secondary/dependencies.bicep rename to modules/sql/server/.test/secondary/dependencies.bicep diff --git a/modules/sql/servers/.test/secondary/main.test.bicep b/modules/sql/server/.test/secondary/main.test.bicep similarity index 100% rename from modules/sql/servers/.test/secondary/main.test.bicep rename to modules/sql/server/.test/secondary/main.test.bicep diff --git a/modules/sql/servers/README.md b/modules/sql/server/README.md similarity index 99% rename from modules/sql/servers/README.md rename to modules/sql/server/README.md index c784ba9d97..82a7827752 100644 --- a/modules/sql/servers/README.md +++ b/modules/sql/server/README.md @@ -378,7 +378,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module servers './sql/servers/main.bicep' = { +module servers './sql/server/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-sqlsadmin' params: { // Required parameters @@ -439,7 +439,7 @@ module servers './sql/servers/main.bicep' = { via Bicep module ```bicep -module servers './sql/servers/main.bicep' = { +module servers './sql/server/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-sqlscom' params: { name: 'sqlscom' @@ -740,7 +740,7 @@ module servers './sql/servers/main.bicep' = { via Bicep module ```bicep -module servers './sql/servers/main.bicep' = { +module servers './sql/server/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-sqlspe' params: { // Required parameters @@ -835,7 +835,7 @@ module servers './sql/servers/main.bicep' = { via Bicep module ```bicep -module servers './sql/servers/main.bicep' = { +module servers './sql/server/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-sqlsec' params: { // Required parameters diff --git a/modules/sql/servers/databases/README.md b/modules/sql/server/databases/README.md similarity index 100% rename from modules/sql/servers/databases/README.md rename to modules/sql/server/databases/README.md diff --git a/modules/sql/servers/databases/backup-long-term-retention-policies/README.md b/modules/sql/server/databases/backup-long-term-retention-policies/README.md similarity index 100% rename from modules/sql/servers/databases/backup-long-term-retention-policies/README.md rename to modules/sql/server/databases/backup-long-term-retention-policies/README.md diff --git a/modules/sql/servers/databases/backup-long-term-retention-policies/main.bicep b/modules/sql/server/databases/backup-long-term-retention-policies/main.bicep similarity index 100% rename from modules/sql/servers/databases/backup-long-term-retention-policies/main.bicep rename to modules/sql/server/databases/backup-long-term-retention-policies/main.bicep diff --git a/modules/sql/servers/databases/backup-long-term-retention-policies/main.json b/modules/sql/server/databases/backup-long-term-retention-policies/main.json similarity index 100% rename from modules/sql/servers/databases/backup-long-term-retention-policies/main.json rename to modules/sql/server/databases/backup-long-term-retention-policies/main.json diff --git a/modules/sql/servers/databases/backup-long-term-retention-policies/version.json b/modules/sql/server/databases/backup-long-term-retention-policies/version.json similarity index 100% rename from modules/sql/servers/databases/backup-long-term-retention-policies/version.json rename to modules/sql/server/databases/backup-long-term-retention-policies/version.json diff --git a/modules/sql/servers/databases/backup-short-term-retention-policies/README.md b/modules/sql/server/databases/backup-short-term-retention-policies/README.md similarity index 100% rename from modules/sql/servers/databases/backup-short-term-retention-policies/README.md rename to modules/sql/server/databases/backup-short-term-retention-policies/README.md diff --git a/modules/sql/servers/databases/backup-short-term-retention-policies/main.bicep b/modules/sql/server/databases/backup-short-term-retention-policies/main.bicep similarity index 100% rename from modules/sql/servers/databases/backup-short-term-retention-policies/main.bicep rename to modules/sql/server/databases/backup-short-term-retention-policies/main.bicep diff --git a/modules/sql/servers/databases/backup-short-term-retention-policies/main.json b/modules/sql/server/databases/backup-short-term-retention-policies/main.json similarity index 100% rename from modules/sql/servers/databases/backup-short-term-retention-policies/main.json rename to modules/sql/server/databases/backup-short-term-retention-policies/main.json diff --git a/modules/sql/servers/databases/backup-short-term-retention-policies/version.json b/modules/sql/server/databases/backup-short-term-retention-policies/version.json similarity index 100% rename from modules/sql/servers/databases/backup-short-term-retention-policies/version.json rename to modules/sql/server/databases/backup-short-term-retention-policies/version.json diff --git a/modules/sql/servers/databases/main.bicep b/modules/sql/server/databases/main.bicep similarity index 99% rename from modules/sql/servers/databases/main.bicep rename to modules/sql/server/databases/main.bicep index 0c70d37cf3..1a5c603171 100644 --- a/modules/sql/servers/databases/main.bicep +++ b/modules/sql/server/databases/main.bicep @@ -264,7 +264,7 @@ resource database_diagnosticSettings 'Microsoft.Insights/diagnosticSettings@2021 scope: database } -module database_backupShortTermRetentionPolicy 'backup-short-term-retention-policies/main.bicep' = { +module database_backupShortTermRetentionPolicy 'backup-short-term-retention-policy/main.bicep' = { name: '${uniqueString(deployment().name, location)}-${name}-shBakRetPol' params: { serverName: serverName @@ -274,7 +274,7 @@ module database_backupShortTermRetentionPolicy 'backup-short-term-retention-poli } } -module database_backupLongTermRetentionPolicy 'backup-long-term-retention-policies/main.bicep' = { +module database_backupLongTermRetentionPolicy 'backup-long-term-retention-policy/main.bicep' = { name: '${uniqueString(deployment().name, location)}-${name}-lgBakRetPol' params: { serverName: serverName diff --git a/modules/sql/servers/databases/main.json b/modules/sql/server/databases/main.json similarity index 100% rename from modules/sql/servers/databases/main.json rename to modules/sql/server/databases/main.json diff --git a/modules/sql/servers/databases/version.json b/modules/sql/server/databases/version.json similarity index 100% rename from modules/sql/servers/databases/version.json rename to modules/sql/server/databases/version.json diff --git a/modules/sql/servers/elastic-pools/README.md b/modules/sql/server/elastic-pools/README.md similarity index 100% rename from modules/sql/servers/elastic-pools/README.md rename to modules/sql/server/elastic-pools/README.md diff --git a/modules/sql/servers/elastic-pools/main.bicep b/modules/sql/server/elastic-pools/main.bicep similarity index 100% rename from modules/sql/servers/elastic-pools/main.bicep rename to modules/sql/server/elastic-pools/main.bicep diff --git a/modules/sql/servers/elastic-pools/main.json b/modules/sql/server/elastic-pools/main.json similarity index 100% rename from modules/sql/servers/elastic-pools/main.json rename to modules/sql/server/elastic-pools/main.json diff --git a/modules/sql/servers/elastic-pools/version.json b/modules/sql/server/elastic-pools/version.json similarity index 100% rename from modules/sql/servers/elastic-pools/version.json rename to modules/sql/server/elastic-pools/version.json diff --git a/modules/sql/servers/encryption-protector/README.md b/modules/sql/server/encryption-protector/README.md similarity index 100% rename from modules/sql/servers/encryption-protector/README.md rename to modules/sql/server/encryption-protector/README.md diff --git a/modules/sql/servers/encryption-protector/main.bicep b/modules/sql/server/encryption-protector/main.bicep similarity index 100% rename from modules/sql/servers/encryption-protector/main.bicep rename to modules/sql/server/encryption-protector/main.bicep diff --git a/modules/sql/servers/encryption-protector/main.json b/modules/sql/server/encryption-protector/main.json similarity index 100% rename from modules/sql/servers/encryption-protector/main.json rename to modules/sql/server/encryption-protector/main.json diff --git a/modules/sql/servers/encryption-protector/version.json b/modules/sql/server/encryption-protector/version.json similarity index 100% rename from modules/sql/servers/encryption-protector/version.json rename to modules/sql/server/encryption-protector/version.json diff --git a/modules/sql/servers/firewall-rules/README.md b/modules/sql/server/firewall-rules/README.md similarity index 100% rename from modules/sql/servers/firewall-rules/README.md rename to modules/sql/server/firewall-rules/README.md diff --git a/modules/sql/servers/firewall-rules/main.bicep b/modules/sql/server/firewall-rules/main.bicep similarity index 100% rename from modules/sql/servers/firewall-rules/main.bicep rename to modules/sql/server/firewall-rules/main.bicep diff --git a/modules/sql/servers/firewall-rules/main.json b/modules/sql/server/firewall-rules/main.json similarity index 100% rename from modules/sql/servers/firewall-rules/main.json rename to modules/sql/server/firewall-rules/main.json diff --git a/modules/sql/servers/firewall-rules/version.json b/modules/sql/server/firewall-rules/version.json similarity index 100% rename from modules/sql/servers/firewall-rules/version.json rename to modules/sql/server/firewall-rules/version.json diff --git a/modules/sql/servers/keys/README.md b/modules/sql/server/keys/README.md similarity index 100% rename from modules/sql/servers/keys/README.md rename to modules/sql/server/keys/README.md diff --git a/modules/sql/servers/keys/main.bicep b/modules/sql/server/keys/main.bicep similarity index 100% rename from modules/sql/servers/keys/main.bicep rename to modules/sql/server/keys/main.bicep diff --git a/modules/sql/servers/keys/main.json b/modules/sql/server/keys/main.json similarity index 100% rename from modules/sql/servers/keys/main.json rename to modules/sql/server/keys/main.json diff --git a/modules/sql/servers/keys/version.json b/modules/sql/server/keys/version.json similarity index 100% rename from modules/sql/servers/keys/version.json rename to modules/sql/server/keys/version.json diff --git a/modules/sql/servers/main.bicep b/modules/sql/server/main.bicep similarity index 95% rename from modules/sql/servers/main.bicep rename to modules/sql/server/main.bicep index aeb907bf06..1ca0ad825f 100644 --- a/modules/sql/servers/main.bicep +++ b/modules/sql/server/main.bicep @@ -162,7 +162,7 @@ module server_roleAssignments '.bicep/nested_roleAssignments.bicep' = [for (role } }] -module server_databases 'databases/main.bicep' = [for (database, index) in databases: { +module server_databases 'database/main.bicep' = [for (database, index) in databases: { name: '${uniqueString(deployment().name, location)}-Sql-DB-${index}' params: { name: database.name @@ -209,7 +209,7 @@ module server_databases 'databases/main.bicep' = [for (database, index) in datab ] }] -module server_elasticPools 'elastic-pools/main.bicep' = [for (elasticPool, index) in elasticPools: { +module server_elasticPools 'elastic-pool/main.bicep' = [for (elasticPool, index) in elasticPools: { name: '${uniqueString(deployment().name, location)}-SQLServer-ElasticPool-${index}' params: { name: elasticPool.name @@ -231,7 +231,7 @@ module server_elasticPools 'elastic-pools/main.bicep' = [for (elasticPool, index } }] -module server_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module server_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-SQLServer-PrivateEndpoint-${index}' params: { groupIds: [ @@ -254,7 +254,7 @@ module server_privateEndpoints '../../network/private-endpoints/main.bicep' = [f } }] -module server_firewallRules 'firewall-rules/main.bicep' = [for (firewallRule, index) in firewallRules: { +module server_firewallRules 'firewall-rule/main.bicep' = [for (firewallRule, index) in firewallRules: { name: '${uniqueString(deployment().name, location)}-Sql-FirewallRules-${index}' params: { name: firewallRule.name @@ -265,7 +265,7 @@ module server_firewallRules 'firewall-rules/main.bicep' = [for (firewallRule, in } }] -module server_virtualNetworkRules 'virtual-network-rules/main.bicep' = [for (virtualNetworkRule, index) in virtualNetworkRules: { +module server_virtualNetworkRules 'virtual-network-rule/main.bicep' = [for (virtualNetworkRule, index) in virtualNetworkRules: { name: '${uniqueString(deployment().name, location)}-Sql-VirtualNetworkRules-${index}' params: { name: virtualNetworkRule.name @@ -276,7 +276,7 @@ module server_virtualNetworkRules 'virtual-network-rules/main.bicep' = [for (vir } }] -module server_securityAlertPolicies 'security-alert-policies/main.bicep' = [for (securityAlertPolicy, index) in securityAlertPolicies: { +module server_securityAlertPolicies 'security-alert-policy/main.bicep' = [for (securityAlertPolicy, index) in securityAlertPolicies: { name: '${uniqueString(deployment().name, location)}-Sql-SecAlertPolicy-${index}' params: { name: securityAlertPolicy.name @@ -292,7 +292,7 @@ module server_securityAlertPolicies 'security-alert-policies/main.bicep' = [for } }] -module server_vulnerabilityAssessment 'vulnerability-assessments/main.bicep' = if (!empty(vulnerabilityAssessmentsObj)) { +module server_vulnerabilityAssessment 'vulnerability-assessment/main.bicep' = if (!empty(vulnerabilityAssessmentsObj)) { name: '${uniqueString(deployment().name, location)}-Sql-VulnAssessm' params: { serverName: server.name @@ -308,7 +308,7 @@ module server_vulnerabilityAssessment 'vulnerability-assessments/main.bicep' = i ] } -module server_keys 'keys/main.bicep' = [for (key, index) in keys: { +module server_keys 'key/main.bicep' = [for (key, index) in keys: { name: '${uniqueString(deployment().name, location)}-Sql-Key-${index}' params: { name: key.name diff --git a/modules/sql/servers/main.json b/modules/sql/server/main.json similarity index 100% rename from modules/sql/servers/main.json rename to modules/sql/server/main.json diff --git a/modules/sql/servers/security-alert-policies/README.md b/modules/sql/server/security-alert-policies/README.md similarity index 100% rename from modules/sql/servers/security-alert-policies/README.md rename to modules/sql/server/security-alert-policies/README.md diff --git a/modules/sql/servers/security-alert-policies/main.bicep b/modules/sql/server/security-alert-policies/main.bicep similarity index 100% rename from modules/sql/servers/security-alert-policies/main.bicep rename to modules/sql/server/security-alert-policies/main.bicep diff --git a/modules/sql/servers/security-alert-policies/main.json b/modules/sql/server/security-alert-policies/main.json similarity index 100% rename from modules/sql/servers/security-alert-policies/main.json rename to modules/sql/server/security-alert-policies/main.json diff --git a/modules/sql/servers/security-alert-policies/version.json b/modules/sql/server/security-alert-policies/version.json similarity index 100% rename from modules/sql/servers/security-alert-policies/version.json rename to modules/sql/server/security-alert-policies/version.json diff --git a/modules/sql/servers/version.json b/modules/sql/server/version.json similarity index 100% rename from modules/sql/servers/version.json rename to modules/sql/server/version.json diff --git a/modules/sql/servers/virtual-network-rules/README.md b/modules/sql/server/virtual-network-rules/README.md similarity index 100% rename from modules/sql/servers/virtual-network-rules/README.md rename to modules/sql/server/virtual-network-rules/README.md diff --git a/modules/sql/servers/virtual-network-rules/main.bicep b/modules/sql/server/virtual-network-rules/main.bicep similarity index 100% rename from modules/sql/servers/virtual-network-rules/main.bicep rename to modules/sql/server/virtual-network-rules/main.bicep diff --git a/modules/sql/servers/virtual-network-rules/main.json b/modules/sql/server/virtual-network-rules/main.json similarity index 100% rename from modules/sql/servers/virtual-network-rules/main.json rename to modules/sql/server/virtual-network-rules/main.json diff --git a/modules/sql/servers/virtual-network-rules/version.json b/modules/sql/server/virtual-network-rules/version.json similarity index 100% rename from modules/sql/servers/virtual-network-rules/version.json rename to modules/sql/server/virtual-network-rules/version.json diff --git a/modules/sql/servers/vulnerability-assessments/README.md b/modules/sql/server/vulnerability-assessments/README.md similarity index 100% rename from modules/sql/servers/vulnerability-assessments/README.md rename to modules/sql/server/vulnerability-assessments/README.md diff --git a/modules/sql/servers/vulnerability-assessments/main.bicep b/modules/sql/server/vulnerability-assessments/main.bicep similarity index 100% rename from modules/sql/servers/vulnerability-assessments/main.bicep rename to modules/sql/server/vulnerability-assessments/main.bicep diff --git a/modules/sql/servers/vulnerability-assessments/main.json b/modules/sql/server/vulnerability-assessments/main.json similarity index 100% rename from modules/sql/servers/vulnerability-assessments/main.json rename to modules/sql/server/vulnerability-assessments/main.json diff --git a/modules/sql/servers/vulnerability-assessments/version.json b/modules/sql/server/vulnerability-assessments/version.json similarity index 100% rename from modules/sql/servers/vulnerability-assessments/version.json rename to modules/sql/server/vulnerability-assessments/version.json diff --git a/modules/storage/storage-accounts/.bicep/nested_roleAssignments.bicep b/modules/storage/storage-account/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/storage/storage-accounts/.bicep/nested_roleAssignments.bicep rename to modules/storage/storage-account/.bicep/nested_roleAssignments.bicep diff --git a/modules/storage/storage-accounts/.test/common/dependencies.bicep b/modules/storage/storage-account/.test/common/dependencies.bicep similarity index 100% rename from modules/storage/storage-accounts/.test/common/dependencies.bicep rename to modules/storage/storage-account/.test/common/dependencies.bicep diff --git a/modules/storage/storage-accounts/.test/common/main.test.bicep b/modules/storage/storage-account/.test/common/main.test.bicep similarity index 100% rename from modules/storage/storage-accounts/.test/common/main.test.bicep rename to modules/storage/storage-account/.test/common/main.test.bicep diff --git a/modules/storage/storage-accounts/.test/encr/dependencies.bicep b/modules/storage/storage-account/.test/encr/dependencies.bicep similarity index 100% rename from modules/storage/storage-accounts/.test/encr/dependencies.bicep rename to modules/storage/storage-account/.test/encr/dependencies.bicep diff --git a/modules/storage/storage-accounts/.test/encr/main.test.bicep b/modules/storage/storage-account/.test/encr/main.test.bicep similarity index 100% rename from modules/storage/storage-accounts/.test/encr/main.test.bicep rename to modules/storage/storage-account/.test/encr/main.test.bicep diff --git a/modules/storage/storage-accounts/.test/main.test.bicep b/modules/storage/storage-account/.test/main.test.bicep similarity index 100% rename from modules/storage/storage-accounts/.test/main.test.bicep rename to modules/storage/storage-account/.test/main.test.bicep diff --git a/modules/storage/storage-accounts/.test/min/main.test.bicep b/modules/storage/storage-account/.test/min/main.test.bicep similarity index 100% rename from modules/storage/storage-accounts/.test/min/main.test.bicep rename to modules/storage/storage-account/.test/min/main.test.bicep diff --git a/modules/storage/storage-accounts/.test/nfs/dependencies.bicep b/modules/storage/storage-account/.test/nfs/dependencies.bicep similarity index 100% rename from modules/storage/storage-accounts/.test/nfs/dependencies.bicep rename to modules/storage/storage-account/.test/nfs/dependencies.bicep diff --git a/modules/storage/storage-accounts/.test/nfs/main.test.bicep b/modules/storage/storage-account/.test/nfs/main.test.bicep similarity index 100% rename from modules/storage/storage-accounts/.test/nfs/main.test.bicep rename to modules/storage/storage-account/.test/nfs/main.test.bicep diff --git a/modules/storage/storage-accounts/.test/v1/main.test.bicep b/modules/storage/storage-account/.test/v1/main.test.bicep similarity index 100% rename from modules/storage/storage-accounts/.test/v1/main.test.bicep rename to modules/storage/storage-account/.test/v1/main.test.bicep diff --git a/modules/storage/storage-accounts/README.md b/modules/storage/storage-account/README.md similarity index 99% rename from modules/storage/storage-accounts/README.md rename to modules/storage/storage-account/README.md index 41e7f40155..9c8f14ea9f 100644 --- a/modules/storage/storage-accounts/README.md +++ b/modules/storage/storage-account/README.md @@ -426,7 +426,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module storageAccounts './storage/storage-accounts/main.bicep' = { +module storageAccounts './storage/storage-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ssacom' params: { // Required parameters @@ -891,7 +891,7 @@ module storageAccounts './storage/storage-accounts/main.bicep' = { via Bicep module ```bicep -module storageAccounts './storage/storage-accounts/main.bicep' = { +module storageAccounts './storage/storage-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ssaencr' params: { // Required parameters @@ -1058,7 +1058,7 @@ module storageAccounts './storage/storage-accounts/main.bicep' = { via Bicep module ```bicep -module storageAccounts './storage/storage-accounts/main.bicep' = { +module storageAccounts './storage/storage-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ssamin' params: { // Required parameters @@ -1107,7 +1107,7 @@ module storageAccounts './storage/storage-accounts/main.bicep' = { via Bicep module ```bicep -module storageAccounts './storage/storage-accounts/main.bicep' = { +module storageAccounts './storage/storage-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ssanfs' params: { // Required parameters @@ -1252,7 +1252,7 @@ module storageAccounts './storage/storage-accounts/main.bicep' = { via Bicep module ```bicep -module storageAccounts './storage/storage-accounts/main.bicep' = { +module storageAccounts './storage/storage-account/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-ssav1' params: { // Required parameters diff --git a/modules/storage/storage-accounts/blob-services/README.md b/modules/storage/storage-account/blob-services/README.md similarity index 100% rename from modules/storage/storage-accounts/blob-services/README.md rename to modules/storage/storage-account/blob-services/README.md diff --git a/modules/storage/storage-accounts/blob-services/containers/.bicep/nested_roleAssignments.bicep b/modules/storage/storage-account/blob-services/containers/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/storage/storage-accounts/blob-services/containers/.bicep/nested_roleAssignments.bicep rename to modules/storage/storage-account/blob-services/containers/.bicep/nested_roleAssignments.bicep diff --git a/modules/storage/storage-accounts/blob-services/containers/README.md b/modules/storage/storage-account/blob-services/containers/README.md similarity index 100% rename from modules/storage/storage-accounts/blob-services/containers/README.md rename to modules/storage/storage-account/blob-services/containers/README.md diff --git a/modules/storage/storage-accounts/blob-services/containers/immutability-policies/README.md b/modules/storage/storage-account/blob-services/containers/immutability-policies/README.md similarity index 100% rename from modules/storage/storage-accounts/blob-services/containers/immutability-policies/README.md rename to modules/storage/storage-account/blob-services/containers/immutability-policies/README.md diff --git a/modules/storage/storage-accounts/blob-services/containers/immutability-policies/main.bicep b/modules/storage/storage-account/blob-services/containers/immutability-policies/main.bicep similarity index 100% rename from modules/storage/storage-accounts/blob-services/containers/immutability-policies/main.bicep rename to modules/storage/storage-account/blob-services/containers/immutability-policies/main.bicep diff --git a/modules/storage/storage-accounts/blob-services/containers/immutability-policies/main.json b/modules/storage/storage-account/blob-services/containers/immutability-policies/main.json similarity index 100% rename from modules/storage/storage-accounts/blob-services/containers/immutability-policies/main.json rename to modules/storage/storage-account/blob-services/containers/immutability-policies/main.json diff --git a/modules/storage/storage-accounts/blob-services/containers/immutability-policies/version.json b/modules/storage/storage-account/blob-services/containers/immutability-policies/version.json similarity index 100% rename from modules/storage/storage-accounts/blob-services/containers/immutability-policies/version.json rename to modules/storage/storage-account/blob-services/containers/immutability-policies/version.json diff --git a/modules/storage/storage-accounts/blob-services/containers/main.bicep b/modules/storage/storage-account/blob-services/containers/main.bicep similarity index 98% rename from modules/storage/storage-accounts/blob-services/containers/main.bicep rename to modules/storage/storage-account/blob-services/containers/main.bicep index dc7e8b0381..f9f34c8b36 100644 --- a/modules/storage/storage-accounts/blob-services/containers/main.bicep +++ b/modules/storage/storage-account/blob-services/containers/main.bicep @@ -85,7 +85,7 @@ resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@20 } } -module immutabilityPolicy 'immutability-policies/main.bicep' = if (!empty(immutabilityPolicyProperties)) { +module immutabilityPolicy 'immutability-policy/main.bicep' = if (!empty(immutabilityPolicyProperties)) { name: immutabilityPolicyName params: { storageAccountName: storageAccount.name diff --git a/modules/storage/storage-accounts/blob-services/containers/main.json b/modules/storage/storage-account/blob-services/containers/main.json similarity index 100% rename from modules/storage/storage-accounts/blob-services/containers/main.json rename to modules/storage/storage-account/blob-services/containers/main.json diff --git a/modules/storage/storage-accounts/blob-services/containers/version.json b/modules/storage/storage-account/blob-services/containers/version.json similarity index 100% rename from modules/storage/storage-accounts/blob-services/containers/version.json rename to modules/storage/storage-account/blob-services/containers/version.json diff --git a/modules/storage/storage-accounts/blob-services/main.bicep b/modules/storage/storage-account/blob-services/main.bicep similarity index 99% rename from modules/storage/storage-accounts/blob-services/main.bicep rename to modules/storage/storage-account/blob-services/main.bicep index 55202edc28..6498194fb8 100644 --- a/modules/storage/storage-accounts/blob-services/main.bicep +++ b/modules/storage/storage-account/blob-services/main.bicep @@ -204,7 +204,7 @@ resource blobServices_diagnosticSettings 'Microsoft.Insights/diagnosticSettings@ scope: blobServices } -module blobServices_container 'containers/main.bicep' = [for (container, index) in containers: { +module blobServices_container 'container/main.bicep' = [for (container, index) in containers: { name: '${deployment().name}-Container-${index}' params: { storageAccountName: storageAccount.name diff --git a/modules/storage/storage-accounts/blob-services/main.json b/modules/storage/storage-account/blob-services/main.json similarity index 100% rename from modules/storage/storage-accounts/blob-services/main.json rename to modules/storage/storage-account/blob-services/main.json diff --git a/modules/storage/storage-accounts/blob-services/version.json b/modules/storage/storage-account/blob-services/version.json similarity index 100% rename from modules/storage/storage-accounts/blob-services/version.json rename to modules/storage/storage-account/blob-services/version.json diff --git a/modules/storage/storage-accounts/file-services/README.md b/modules/storage/storage-account/file-services/README.md similarity index 100% rename from modules/storage/storage-accounts/file-services/README.md rename to modules/storage/storage-account/file-services/README.md diff --git a/modules/storage/storage-accounts/file-services/main.bicep b/modules/storage/storage-account/file-services/main.bicep similarity index 98% rename from modules/storage/storage-accounts/file-services/main.bicep rename to modules/storage/storage-account/file-services/main.bicep index 76a913a942..e66a526b14 100644 --- a/modules/storage/storage-accounts/file-services/main.bicep +++ b/modules/storage/storage-account/file-services/main.bicep @@ -136,7 +136,7 @@ resource fileServices_diagnosticSettings 'Microsoft.Insights/diagnosticSettings@ scope: fileServices } -module fileServices_shares 'shares/main.bicep' = [for (share, index) in shares: { +module fileServices_shares 'share/main.bicep' = [for (share, index) in shares: { name: '${deployment().name}-shares-${index}' params: { storageAccountName: storageAccount.name diff --git a/modules/storage/storage-accounts/file-services/main.json b/modules/storage/storage-account/file-services/main.json similarity index 100% rename from modules/storage/storage-accounts/file-services/main.json rename to modules/storage/storage-account/file-services/main.json diff --git a/modules/storage/storage-accounts/file-services/shares/.bicep/nested_roleAssignments.bicep b/modules/storage/storage-account/file-services/shares/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/storage/storage-accounts/file-services/shares/.bicep/nested_roleAssignments.bicep rename to modules/storage/storage-account/file-services/shares/.bicep/nested_roleAssignments.bicep diff --git a/modules/storage/storage-accounts/file-services/shares/README.md b/modules/storage/storage-account/file-services/shares/README.md similarity index 100% rename from modules/storage/storage-accounts/file-services/shares/README.md rename to modules/storage/storage-account/file-services/shares/README.md diff --git a/modules/storage/storage-accounts/file-services/shares/main.bicep b/modules/storage/storage-account/file-services/shares/main.bicep similarity index 100% rename from modules/storage/storage-accounts/file-services/shares/main.bicep rename to modules/storage/storage-account/file-services/shares/main.bicep diff --git a/modules/storage/storage-accounts/file-services/shares/main.json b/modules/storage/storage-account/file-services/shares/main.json similarity index 100% rename from modules/storage/storage-accounts/file-services/shares/main.json rename to modules/storage/storage-account/file-services/shares/main.json diff --git a/modules/storage/storage-accounts/file-services/shares/version.json b/modules/storage/storage-account/file-services/shares/version.json similarity index 100% rename from modules/storage/storage-accounts/file-services/shares/version.json rename to modules/storage/storage-account/file-services/shares/version.json diff --git a/modules/storage/storage-accounts/file-services/version.json b/modules/storage/storage-account/file-services/version.json similarity index 100% rename from modules/storage/storage-accounts/file-services/version.json rename to modules/storage/storage-account/file-services/version.json diff --git a/modules/storage/storage-accounts/local-users/README.md b/modules/storage/storage-account/local-users/README.md similarity index 100% rename from modules/storage/storage-accounts/local-users/README.md rename to modules/storage/storage-account/local-users/README.md diff --git a/modules/storage/storage-accounts/local-users/main.bicep b/modules/storage/storage-account/local-users/main.bicep similarity index 100% rename from modules/storage/storage-accounts/local-users/main.bicep rename to modules/storage/storage-account/local-users/main.bicep diff --git a/modules/storage/storage-accounts/local-users/main.json b/modules/storage/storage-account/local-users/main.json similarity index 100% rename from modules/storage/storage-accounts/local-users/main.json rename to modules/storage/storage-account/local-users/main.json diff --git a/modules/storage/storage-accounts/local-users/version.json b/modules/storage/storage-account/local-users/version.json similarity index 100% rename from modules/storage/storage-accounts/local-users/version.json rename to modules/storage/storage-account/local-users/version.json diff --git a/modules/storage/storage-accounts/main.bicep b/modules/storage/storage-account/main.bicep similarity index 97% rename from modules/storage/storage-accounts/main.bicep rename to modules/storage/storage-account/main.bicep index a66639c759..b3371af496 100644 --- a/modules/storage/storage-accounts/main.bicep +++ b/modules/storage/storage-account/main.bicep @@ -349,7 +349,7 @@ module storageAccount_roleAssignments '.bicep/nested_roleAssignments.bicep' = [f } }] -module storageAccount_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module storageAccount_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-StorageAccount-PrivateEndpoint-${index}' params: { groupIds: [ @@ -373,7 +373,7 @@ module storageAccount_privateEndpoints '../../network/private-endpoints/main.bic }] // Lifecycle Policy -module storageAccount_managementPolicies 'management-policies/main.bicep' = if (!empty(managementPolicyRules)) { +module storageAccount_managementPolicies 'management-policy/main.bicep' = if (!empty(managementPolicyRules)) { name: '${uniqueString(deployment().name, location)}-Storage-ManagementPolicies' params: { storageAccountName: storageAccount.name @@ -383,7 +383,7 @@ module storageAccount_managementPolicies 'management-policies/main.bicep' = if ( } // SFTP user settings -module storageAccount_localUsers 'local-users/main.bicep' = [for (localUser, index) in localUsers: { +module storageAccount_localUsers 'local-user/main.bicep' = [for (localUser, index) in localUsers: { name: '${uniqueString(deployment().name, location)}-Storage-LocalUsers-${index}' params: { storageAccountName: storageAccount.name @@ -399,7 +399,7 @@ module storageAccount_localUsers 'local-users/main.bicep' = [for (localUser, ind }] // Containers -module storageAccount_blobServices 'blob-services/main.bicep' = if (!empty(blobServices)) { +module storageAccount_blobServices 'blob-service/main.bicep' = if (!empty(blobServices)) { name: '${uniqueString(deployment().name, location)}-Storage-BlobServices' params: { storageAccountName: storageAccount.name @@ -431,7 +431,7 @@ module storageAccount_blobServices 'blob-services/main.bicep' = if (!empty(blobS } // File Shares -module storageAccount_fileServices 'file-services/main.bicep' = if (!empty(fileServices)) { +module storageAccount_fileServices 'file-service/main.bicep' = if (!empty(fileServices)) { name: '${uniqueString(deployment().name, location)}-Storage-FileServices' params: { storageAccountName: storageAccount.name @@ -453,7 +453,7 @@ module storageAccount_fileServices 'file-services/main.bicep' = if (!empty(fileS } // Queue -module storageAccount_queueServices 'queue-services/main.bicep' = if (!empty(queueServices)) { +module storageAccount_queueServices 'queue-service/main.bicep' = if (!empty(queueServices)) { name: '${uniqueString(deployment().name, location)}-Storage-QueueServices' params: { storageAccountName: storageAccount.name @@ -470,7 +470,7 @@ module storageAccount_queueServices 'queue-services/main.bicep' = if (!empty(que } // Table -module storageAccount_tableServices 'table-services/main.bicep' = if (!empty(tableServices)) { +module storageAccount_tableServices 'table-service/main.bicep' = if (!empty(tableServices)) { name: '${uniqueString(deployment().name, location)}-Storage-TableServices' params: { storageAccountName: storageAccount.name diff --git a/modules/storage/storage-accounts/main.json b/modules/storage/storage-account/main.json similarity index 100% rename from modules/storage/storage-accounts/main.json rename to modules/storage/storage-account/main.json diff --git a/modules/storage/storage-accounts/management-policies/README.md b/modules/storage/storage-account/management-policies/README.md similarity index 100% rename from modules/storage/storage-accounts/management-policies/README.md rename to modules/storage/storage-account/management-policies/README.md diff --git a/modules/storage/storage-accounts/management-policies/main.bicep b/modules/storage/storage-account/management-policies/main.bicep similarity index 100% rename from modules/storage/storage-accounts/management-policies/main.bicep rename to modules/storage/storage-account/management-policies/main.bicep diff --git a/modules/storage/storage-accounts/management-policies/main.json b/modules/storage/storage-account/management-policies/main.json similarity index 100% rename from modules/storage/storage-accounts/management-policies/main.json rename to modules/storage/storage-account/management-policies/main.json diff --git a/modules/storage/storage-accounts/management-policies/version.json b/modules/storage/storage-account/management-policies/version.json similarity index 100% rename from modules/storage/storage-accounts/management-policies/version.json rename to modules/storage/storage-account/management-policies/version.json diff --git a/modules/storage/storage-accounts/queue-services/README.md b/modules/storage/storage-account/queue-services/README.md similarity index 100% rename from modules/storage/storage-accounts/queue-services/README.md rename to modules/storage/storage-account/queue-services/README.md diff --git a/modules/storage/storage-accounts/queue-services/main.bicep b/modules/storage/storage-account/queue-services/main.bicep similarity index 98% rename from modules/storage/storage-accounts/queue-services/main.bicep rename to modules/storage/storage-account/queue-services/main.bicep index 28689d5357..649f1f0147 100644 --- a/modules/storage/storage-accounts/queue-services/main.bicep +++ b/modules/storage/storage-account/queue-services/main.bicep @@ -122,7 +122,7 @@ resource queueServices_diagnosticSettings 'Microsoft.Insights/diagnosticSettings scope: queueServices } -module queueServices_queues 'queues/main.bicep' = [for (queue, index) in queues: { +module queueServices_queues 'queue/main.bicep' = [for (queue, index) in queues: { name: '${deployment().name}-Queue-${index}' params: { storageAccountName: storageAccount.name diff --git a/modules/storage/storage-accounts/queue-services/main.json b/modules/storage/storage-account/queue-services/main.json similarity index 100% rename from modules/storage/storage-accounts/queue-services/main.json rename to modules/storage/storage-account/queue-services/main.json diff --git a/modules/storage/storage-accounts/queue-services/queues/.bicep/nested_roleAssignments.bicep b/modules/storage/storage-account/queue-services/queues/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/storage/storage-accounts/queue-services/queues/.bicep/nested_roleAssignments.bicep rename to modules/storage/storage-account/queue-services/queues/.bicep/nested_roleAssignments.bicep diff --git a/modules/storage/storage-accounts/queue-services/queues/README.md b/modules/storage/storage-account/queue-services/queues/README.md similarity index 100% rename from modules/storage/storage-accounts/queue-services/queues/README.md rename to modules/storage/storage-account/queue-services/queues/README.md diff --git a/modules/storage/storage-accounts/queue-services/queues/main.bicep b/modules/storage/storage-account/queue-services/queues/main.bicep similarity index 100% rename from modules/storage/storage-accounts/queue-services/queues/main.bicep rename to modules/storage/storage-account/queue-services/queues/main.bicep diff --git a/modules/storage/storage-accounts/queue-services/queues/main.json b/modules/storage/storage-account/queue-services/queues/main.json similarity index 100% rename from modules/storage/storage-accounts/queue-services/queues/main.json rename to modules/storage/storage-account/queue-services/queues/main.json diff --git a/modules/storage/storage-accounts/queue-services/queues/version.json b/modules/storage/storage-account/queue-services/queues/version.json similarity index 100% rename from modules/storage/storage-accounts/queue-services/queues/version.json rename to modules/storage/storage-account/queue-services/queues/version.json diff --git a/modules/storage/storage-accounts/queue-services/version.json b/modules/storage/storage-account/queue-services/version.json similarity index 100% rename from modules/storage/storage-accounts/queue-services/version.json rename to modules/storage/storage-account/queue-services/version.json diff --git a/modules/storage/storage-accounts/table-services/README.md b/modules/storage/storage-account/table-services/README.md similarity index 100% rename from modules/storage/storage-accounts/table-services/README.md rename to modules/storage/storage-account/table-services/README.md diff --git a/modules/storage/storage-accounts/table-services/main.bicep b/modules/storage/storage-account/table-services/main.bicep similarity index 98% rename from modules/storage/storage-accounts/table-services/main.bicep rename to modules/storage/storage-account/table-services/main.bicep index f3b5f7584f..3d43322b4d 100644 --- a/modules/storage/storage-accounts/table-services/main.bicep +++ b/modules/storage/storage-account/table-services/main.bicep @@ -122,7 +122,7 @@ resource tableServices_diagnosticSettings 'Microsoft.Insights/diagnosticSettings scope: tableServices } -module tableServices_tables 'tables/main.bicep' = [for (tableName, index) in tables: { +module tableServices_tables 'table/main.bicep' = [for (tableName, index) in tables: { name: '${deployment().name}-Table-${index}' params: { name: tableName diff --git a/modules/storage/storage-accounts/table-services/main.json b/modules/storage/storage-account/table-services/main.json similarity index 100% rename from modules/storage/storage-accounts/table-services/main.json rename to modules/storage/storage-account/table-services/main.json diff --git a/modules/storage/storage-accounts/table-services/tables/README.md b/modules/storage/storage-account/table-services/tables/README.md similarity index 100% rename from modules/storage/storage-accounts/table-services/tables/README.md rename to modules/storage/storage-account/table-services/tables/README.md diff --git a/modules/storage/storage-accounts/table-services/tables/main.bicep b/modules/storage/storage-account/table-services/tables/main.bicep similarity index 100% rename from modules/storage/storage-accounts/table-services/tables/main.bicep rename to modules/storage/storage-account/table-services/tables/main.bicep diff --git a/modules/storage/storage-accounts/table-services/tables/main.json b/modules/storage/storage-account/table-services/tables/main.json similarity index 100% rename from modules/storage/storage-accounts/table-services/tables/main.json rename to modules/storage/storage-account/table-services/tables/main.json diff --git a/modules/storage/storage-accounts/table-services/tables/version.json b/modules/storage/storage-account/table-services/tables/version.json similarity index 100% rename from modules/storage/storage-accounts/table-services/tables/version.json rename to modules/storage/storage-account/table-services/tables/version.json diff --git a/modules/storage/storage-accounts/table-services/version.json b/modules/storage/storage-account/table-services/version.json similarity index 100% rename from modules/storage/storage-accounts/table-services/version.json rename to modules/storage/storage-account/table-services/version.json diff --git a/modules/storage/storage-accounts/version.json b/modules/storage/storage-account/version.json similarity index 100% rename from modules/storage/storage-accounts/version.json rename to modules/storage/storage-account/version.json diff --git a/modules/synapse/private-link-hubs/.bicep/nested_roleAssignments.bicep b/modules/synapse/private-link-hub/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/synapse/private-link-hubs/.bicep/nested_roleAssignments.bicep rename to modules/synapse/private-link-hub/.bicep/nested_roleAssignments.bicep diff --git a/modules/synapse/private-link-hubs/.test/common/dependencies.bicep b/modules/synapse/private-link-hub/.test/common/dependencies.bicep similarity index 100% rename from modules/synapse/private-link-hubs/.test/common/dependencies.bicep rename to modules/synapse/private-link-hub/.test/common/dependencies.bicep diff --git a/modules/synapse/private-link-hubs/.test/common/main.test.bicep b/modules/synapse/private-link-hub/.test/common/main.test.bicep similarity index 100% rename from modules/synapse/private-link-hubs/.test/common/main.test.bicep rename to modules/synapse/private-link-hub/.test/common/main.test.bicep diff --git a/modules/synapse/private-link-hubs/.test/main.test.bicep b/modules/synapse/private-link-hub/.test/main.test.bicep similarity index 100% rename from modules/synapse/private-link-hubs/.test/main.test.bicep rename to modules/synapse/private-link-hub/.test/main.test.bicep diff --git a/modules/synapse/private-link-hubs/.test/min/main.test.bicep b/modules/synapse/private-link-hub/.test/min/main.test.bicep similarity index 100% rename from modules/synapse/private-link-hubs/.test/min/main.test.bicep rename to modules/synapse/private-link-hub/.test/min/main.test.bicep diff --git a/modules/synapse/private-link-hubs/README.md b/modules/synapse/private-link-hub/README.md similarity index 99% rename from modules/synapse/private-link-hubs/README.md rename to modules/synapse/private-link-hub/README.md index 4115726c0a..e65e912a6f 100644 --- a/modules/synapse/private-link-hubs/README.md +++ b/modules/synapse/private-link-hub/README.md @@ -271,7 +271,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module privateLinkHubs './synapse/private-link-hubs/main.bicep' = { +module privateLinkHubs './synapse/private-link-hub/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-splhcom' params: { // Required parameters @@ -394,7 +394,7 @@ module privateLinkHubs './synapse/private-link-hubs/main.bicep' = { via Bicep module ```bicep -module privateLinkHubs './synapse/private-link-hubs/main.bicep' = { +module privateLinkHubs './synapse/private-link-hub/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-splhmin' params: { // Required parameters diff --git a/modules/synapse/private-link-hubs/main.bicep b/modules/synapse/private-link-hub/main.bicep similarity index 98% rename from modules/synapse/private-link-hubs/main.bicep rename to modules/synapse/private-link-hub/main.bicep index c64d9ce350..38bda5d58d 100644 --- a/modules/synapse/private-link-hubs/main.bicep +++ b/modules/synapse/private-link-hub/main.bicep @@ -73,7 +73,7 @@ module privateLinkHub_roleAssignments '.bicep/nested_roleAssignments.bicep' = [f }] // Private Endpoints -module privateLinkHub_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module privateLinkHub_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-PrivateLinkHub-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/synapse/private-link-hubs/main.json b/modules/synapse/private-link-hub/main.json similarity index 100% rename from modules/synapse/private-link-hubs/main.json rename to modules/synapse/private-link-hub/main.json diff --git a/modules/synapse/private-link-hubs/version.json b/modules/synapse/private-link-hub/version.json similarity index 100% rename from modules/synapse/private-link-hubs/version.json rename to modules/synapse/private-link-hub/version.json diff --git a/modules/synapse/workspaces/.bicep/nested_cmkRbac.bicep b/modules/synapse/workspace/.bicep/nested_cmkRbac.bicep similarity index 100% rename from modules/synapse/workspaces/.bicep/nested_cmkRbac.bicep rename to modules/synapse/workspace/.bicep/nested_cmkRbac.bicep diff --git a/modules/synapse/workspaces/.bicep/nested_roleAssignments.bicep b/modules/synapse/workspace/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/synapse/workspaces/.bicep/nested_roleAssignments.bicep rename to modules/synapse/workspace/.bicep/nested_roleAssignments.bicep diff --git a/modules/synapse/workspaces/.test/common/dependencies.bicep b/modules/synapse/workspace/.test/common/dependencies.bicep similarity index 100% rename from modules/synapse/workspaces/.test/common/dependencies.bicep rename to modules/synapse/workspace/.test/common/dependencies.bicep diff --git a/modules/synapse/workspaces/.test/common/main.test.bicep b/modules/synapse/workspace/.test/common/main.test.bicep similarity index 100% rename from modules/synapse/workspaces/.test/common/main.test.bicep rename to modules/synapse/workspace/.test/common/main.test.bicep diff --git a/modules/synapse/workspaces/.test/encrwsai/dependencies.bicep b/modules/synapse/workspace/.test/encrwsai/dependencies.bicep similarity index 100% rename from modules/synapse/workspaces/.test/encrwsai/dependencies.bicep rename to modules/synapse/workspace/.test/encrwsai/dependencies.bicep diff --git a/modules/synapse/workspaces/.test/encrwsai/main.test.bicep b/modules/synapse/workspace/.test/encrwsai/main.test.bicep similarity index 100% rename from modules/synapse/workspaces/.test/encrwsai/main.test.bicep rename to modules/synapse/workspace/.test/encrwsai/main.test.bicep diff --git a/modules/synapse/workspaces/.test/encrwuai/dependencies.bicep b/modules/synapse/workspace/.test/encrwuai/dependencies.bicep similarity index 100% rename from modules/synapse/workspaces/.test/encrwuai/dependencies.bicep rename to modules/synapse/workspace/.test/encrwuai/dependencies.bicep diff --git a/modules/synapse/workspaces/.test/encrwuai/main.test.bicep b/modules/synapse/workspace/.test/encrwuai/main.test.bicep similarity index 100% rename from modules/synapse/workspaces/.test/encrwuai/main.test.bicep rename to modules/synapse/workspace/.test/encrwuai/main.test.bicep diff --git a/modules/synapse/workspaces/.test/main.test.bicep b/modules/synapse/workspace/.test/main.test.bicep similarity index 100% rename from modules/synapse/workspaces/.test/main.test.bicep rename to modules/synapse/workspace/.test/main.test.bicep diff --git a/modules/synapse/workspaces/.test/managedvnet/dependencies.bicep b/modules/synapse/workspace/.test/managedvnet/dependencies.bicep similarity index 100% rename from modules/synapse/workspaces/.test/managedvnet/dependencies.bicep rename to modules/synapse/workspace/.test/managedvnet/dependencies.bicep diff --git a/modules/synapse/workspaces/.test/managedvnet/main.test.bicep b/modules/synapse/workspace/.test/managedvnet/main.test.bicep similarity index 100% rename from modules/synapse/workspaces/.test/managedvnet/main.test.bicep rename to modules/synapse/workspace/.test/managedvnet/main.test.bicep diff --git a/modules/synapse/workspaces/.test/min/dependencies.bicep b/modules/synapse/workspace/.test/min/dependencies.bicep similarity index 100% rename from modules/synapse/workspaces/.test/min/dependencies.bicep rename to modules/synapse/workspace/.test/min/dependencies.bicep diff --git a/modules/synapse/workspaces/.test/min/main.test.bicep b/modules/synapse/workspace/.test/min/main.test.bicep similarity index 100% rename from modules/synapse/workspaces/.test/min/main.test.bicep rename to modules/synapse/workspace/.test/min/main.test.bicep diff --git a/modules/synapse/workspaces/README.md b/modules/synapse/workspace/README.md similarity index 99% rename from modules/synapse/workspaces/README.md rename to modules/synapse/workspace/README.md index c54070200d..6f490ef722 100644 --- a/modules/synapse/workspaces/README.md +++ b/modules/synapse/workspace/README.md @@ -345,7 +345,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module workspaces './synapse/workspaces/main.bicep' = { +module workspaces './synapse/workspace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-swcom' params: { // Required parameters @@ -524,7 +524,7 @@ module workspaces './synapse/workspaces/main.bicep' = { via Bicep module ```bicep -module workspaces './synapse/workspaces/main.bicep' = { +module workspaces './synapse/workspace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-swensa' params: { // Required parameters @@ -601,7 +601,7 @@ module workspaces './synapse/workspaces/main.bicep' = { via Bicep module ```bicep -module workspaces './synapse/workspaces/main.bicep' = { +module workspaces './synapse/workspace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-swenua' params: { // Required parameters @@ -684,7 +684,7 @@ module workspaces './synapse/workspaces/main.bicep' = { via Bicep module ```bicep -module workspaces './synapse/workspaces/main.bicep' = { +module workspaces './synapse/workspace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-swmanv' params: { // Required parameters @@ -767,7 +767,7 @@ module workspaces './synapse/workspaces/main.bicep' = { via Bicep module ```bicep -module workspaces './synapse/workspaces/main.bicep' = { +module workspaces './synapse/workspace/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-swmin' params: { // Required parameters diff --git a/modules/synapse/workspaces/integration-runtimes/README.md b/modules/synapse/workspace/integration-runtimes/README.md similarity index 100% rename from modules/synapse/workspaces/integration-runtimes/README.md rename to modules/synapse/workspace/integration-runtimes/README.md diff --git a/modules/synapse/workspaces/integration-runtimes/main.bicep b/modules/synapse/workspace/integration-runtimes/main.bicep similarity index 100% rename from modules/synapse/workspaces/integration-runtimes/main.bicep rename to modules/synapse/workspace/integration-runtimes/main.bicep diff --git a/modules/synapse/workspaces/integration-runtimes/main.json b/modules/synapse/workspace/integration-runtimes/main.json similarity index 100% rename from modules/synapse/workspaces/integration-runtimes/main.json rename to modules/synapse/workspace/integration-runtimes/main.json diff --git a/modules/synapse/workspaces/integration-runtimes/version.json b/modules/synapse/workspace/integration-runtimes/version.json similarity index 100% rename from modules/synapse/workspaces/integration-runtimes/version.json rename to modules/synapse/workspace/integration-runtimes/version.json diff --git a/modules/synapse/workspaces/keys/README.md b/modules/synapse/workspace/keys/README.md similarity index 100% rename from modules/synapse/workspaces/keys/README.md rename to modules/synapse/workspace/keys/README.md diff --git a/modules/synapse/workspaces/keys/main.bicep b/modules/synapse/workspace/keys/main.bicep similarity index 100% rename from modules/synapse/workspaces/keys/main.bicep rename to modules/synapse/workspace/keys/main.bicep diff --git a/modules/synapse/workspaces/keys/main.json b/modules/synapse/workspace/keys/main.json similarity index 100% rename from modules/synapse/workspaces/keys/main.json rename to modules/synapse/workspace/keys/main.json diff --git a/modules/synapse/workspaces/keys/version.json b/modules/synapse/workspace/keys/version.json similarity index 100% rename from modules/synapse/workspaces/keys/version.json rename to modules/synapse/workspace/keys/version.json diff --git a/modules/synapse/workspaces/main.bicep b/modules/synapse/workspace/main.bicep similarity index 98% rename from modules/synapse/workspaces/main.bicep rename to modules/synapse/workspace/main.bicep index f12262403c..7799db3908 100644 --- a/modules/synapse/workspaces/main.bicep +++ b/modules/synapse/workspace/main.bicep @@ -244,7 +244,7 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { } // Workspace integration runtimes -module synapse_integrationRuntimes 'integration-runtimes/main.bicep' = [for (integrationRuntime, index) in integrationRuntimes: { +module synapse_integrationRuntimes 'integration-runtime/main.bicep' = [for (integrationRuntime, index) in integrationRuntimes: { name: '${uniqueString(deployment().name, location)}-Synapse-IntegrationRuntime-${index}' params: { workspaceName: workspace.name @@ -268,7 +268,7 @@ module workspace_cmk_rbac './.bicep/nested_cmkRbac.bicep' = if (encryptionActiva } // - Workspace encryption - Activate Workspace -module workspace_key './keys/main.bicep' = if (encryptionActivateWorkspace) { +module workspace_key './key/main.bicep' = if (encryptionActivateWorkspace) { name: '${workspace.name}-cmk-activation' params: { name: cMKKeyName @@ -302,7 +302,7 @@ module workspace_rbac '.bicep/nested_roleAssignments.bicep' = [for (roleAssignme }] // Endpoints -module workspace_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module workspace_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-Workspace-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/synapse/workspaces/main.json b/modules/synapse/workspace/main.json similarity index 100% rename from modules/synapse/workspaces/main.json rename to modules/synapse/workspace/main.json diff --git a/modules/synapse/workspaces/version.json b/modules/synapse/workspace/version.json similarity index 100% rename from modules/synapse/workspaces/version.json rename to modules/synapse/workspace/version.json diff --git a/modules/virtual-machine-images/image-templates/.bicep/nested_roleAssignments.bicep b/modules/virtual-machine-images/image-template/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/virtual-machine-images/image-templates/.bicep/nested_roleAssignments.bicep rename to modules/virtual-machine-images/image-template/.bicep/nested_roleAssignments.bicep diff --git a/modules/virtual-machine-images/image-templates/.test/common/dependencies.bicep b/modules/virtual-machine-images/image-template/.test/common/dependencies.bicep similarity index 100% rename from modules/virtual-machine-images/image-templates/.test/common/dependencies.bicep rename to modules/virtual-machine-images/image-template/.test/common/dependencies.bicep diff --git a/modules/virtual-machine-images/image-templates/.test/common/main.test.bicep b/modules/virtual-machine-images/image-template/.test/common/main.test.bicep similarity index 100% rename from modules/virtual-machine-images/image-templates/.test/common/main.test.bicep rename to modules/virtual-machine-images/image-template/.test/common/main.test.bicep diff --git a/modules/virtual-machine-images/image-templates/.test/main.test.bicep b/modules/virtual-machine-images/image-template/.test/main.test.bicep similarity index 100% rename from modules/virtual-machine-images/image-templates/.test/main.test.bicep rename to modules/virtual-machine-images/image-template/.test/main.test.bicep diff --git a/modules/virtual-machine-images/image-templates/.test/min/dependencies.bicep b/modules/virtual-machine-images/image-template/.test/min/dependencies.bicep similarity index 100% rename from modules/virtual-machine-images/image-templates/.test/min/dependencies.bicep rename to modules/virtual-machine-images/image-template/.test/min/dependencies.bicep diff --git a/modules/virtual-machine-images/image-templates/.test/min/main.test.bicep b/modules/virtual-machine-images/image-template/.test/min/main.test.bicep similarity index 100% rename from modules/virtual-machine-images/image-templates/.test/min/main.test.bicep rename to modules/virtual-machine-images/image-template/.test/min/main.test.bicep diff --git a/modules/virtual-machine-images/image-templates/README.md b/modules/virtual-machine-images/image-template/README.md similarity index 99% rename from modules/virtual-machine-images/image-templates/README.md rename to modules/virtual-machine-images/image-template/README.md index b4e730d48c..8d22e189c2 100644 --- a/modules/virtual-machine-images/image-templates/README.md +++ b/modules/virtual-machine-images/image-template/README.md @@ -352,7 +352,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module imageTemplates './virtual-machine-images/image-templates/main.bicep' = { +module imageTemplates './virtual-machine-images/image-template/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-vmiitcom' params: { // Required parameters @@ -517,7 +517,7 @@ module imageTemplates './virtual-machine-images/image-templates/main.bicep' = { via Bicep module ```bicep -module imageTemplates './virtual-machine-images/image-templates/main.bicep' = { +module imageTemplates './virtual-machine-images/image-template/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-vmiitmin' params: { // Required parameters diff --git a/modules/virtual-machine-images/image-templates/main.bicep b/modules/virtual-machine-images/image-template/main.bicep similarity index 100% rename from modules/virtual-machine-images/image-templates/main.bicep rename to modules/virtual-machine-images/image-template/main.bicep diff --git a/modules/virtual-machine-images/image-templates/main.json b/modules/virtual-machine-images/image-template/main.json similarity index 100% rename from modules/virtual-machine-images/image-templates/main.json rename to modules/virtual-machine-images/image-template/main.json diff --git a/modules/virtual-machine-images/image-templates/version.json b/modules/virtual-machine-images/image-template/version.json similarity index 100% rename from modules/virtual-machine-images/image-templates/version.json rename to modules/virtual-machine-images/image-template/version.json diff --git a/modules/web/connections/.bicep/nested_roleAssignments.bicep b/modules/web/connection/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/web/connections/.bicep/nested_roleAssignments.bicep rename to modules/web/connection/.bicep/nested_roleAssignments.bicep diff --git a/modules/web/connections/.test/common/dependencies.bicep b/modules/web/connection/.test/common/dependencies.bicep similarity index 100% rename from modules/web/connections/.test/common/dependencies.bicep rename to modules/web/connection/.test/common/dependencies.bicep diff --git a/modules/web/connections/.test/common/main.test.bicep b/modules/web/connection/.test/common/main.test.bicep similarity index 100% rename from modules/web/connections/.test/common/main.test.bicep rename to modules/web/connection/.test/common/main.test.bicep diff --git a/modules/web/connections/.test/main.test.bicep b/modules/web/connection/.test/main.test.bicep similarity index 100% rename from modules/web/connections/.test/main.test.bicep rename to modules/web/connection/.test/main.test.bicep diff --git a/modules/web/connections/README.md b/modules/web/connection/README.md similarity index 99% rename from modules/web/connections/README.md rename to modules/web/connection/README.md index bc087a3f02..0fe03ac2e2 100644 --- a/modules/web/connections/README.md +++ b/modules/web/connection/README.md @@ -171,7 +171,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module connections './web/connections/main.bicep' = { +module connections './web/connection/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-wccom' params: { // Required parameters diff --git a/modules/web/connections/main.bicep b/modules/web/connection/main.bicep similarity index 100% rename from modules/web/connections/main.bicep rename to modules/web/connection/main.bicep diff --git a/modules/web/connections/main.json b/modules/web/connection/main.json similarity index 100% rename from modules/web/connections/main.json rename to modules/web/connection/main.json diff --git a/modules/web/connections/version.json b/modules/web/connection/version.json similarity index 100% rename from modules/web/connections/version.json rename to modules/web/connection/version.json diff --git a/modules/web/hosting-environments/.bicep/nested_roleAssignments.bicep b/modules/web/hosting-environment/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/web/hosting-environments/.bicep/nested_roleAssignments.bicep rename to modules/web/hosting-environment/.bicep/nested_roleAssignments.bicep diff --git a/modules/web/hosting-environments/.test/asev2/dependencies.bicep b/modules/web/hosting-environment/.test/asev2/dependencies.bicep similarity index 100% rename from modules/web/hosting-environments/.test/asev2/dependencies.bicep rename to modules/web/hosting-environment/.test/asev2/dependencies.bicep diff --git a/modules/web/hosting-environments/.test/asev2/main.test.bicep b/modules/web/hosting-environment/.test/asev2/main.test.bicep similarity index 100% rename from modules/web/hosting-environments/.test/asev2/main.test.bicep rename to modules/web/hosting-environment/.test/asev2/main.test.bicep diff --git a/modules/web/hosting-environments/.test/asev3/dependencies.bicep b/modules/web/hosting-environment/.test/asev3/dependencies.bicep similarity index 100% rename from modules/web/hosting-environments/.test/asev3/dependencies.bicep rename to modules/web/hosting-environment/.test/asev3/dependencies.bicep diff --git a/modules/web/hosting-environments/.test/asev3/main.test.bicep b/modules/web/hosting-environment/.test/asev3/main.test.bicep similarity index 100% rename from modules/web/hosting-environments/.test/asev3/main.test.bicep rename to modules/web/hosting-environment/.test/asev3/main.test.bicep diff --git a/modules/web/hosting-environments/.test/main.test.bicep b/modules/web/hosting-environment/.test/main.test.bicep similarity index 100% rename from modules/web/hosting-environments/.test/main.test.bicep rename to modules/web/hosting-environment/.test/main.test.bicep diff --git a/modules/web/hosting-environments/README.md b/modules/web/hosting-environment/README.md similarity index 99% rename from modules/web/hosting-environments/README.md rename to modules/web/hosting-environment/README.md index 8ede4b24ea..e925ccdcc4 100644 --- a/modules/web/hosting-environments/README.md +++ b/modules/web/hosting-environment/README.md @@ -267,7 +267,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module hostingEnvironments './web/hosting-environments/main.bicep' = { +module hostingEnvironments './web/hosting-environment/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-whasev2' params: { // Required parameters @@ -412,7 +412,7 @@ module hostingEnvironments './web/hosting-environments/main.bicep' = { via Bicep module ```bicep -module hostingEnvironments './web/hosting-environments/main.bicep' = { +module hostingEnvironments './web/hosting-environment/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-whasev3' params: { // Required parameters diff --git a/modules/web/hosting-environments/configurations--customdnssuffix/README.md b/modules/web/hosting-environment/configurations--customdnssuffix/README.md similarity index 100% rename from modules/web/hosting-environments/configurations--customdnssuffix/README.md rename to modules/web/hosting-environment/configurations--customdnssuffix/README.md diff --git a/modules/web/hosting-environments/configurations--customdnssuffix/main.bicep b/modules/web/hosting-environment/configurations--customdnssuffix/main.bicep similarity index 100% rename from modules/web/hosting-environments/configurations--customdnssuffix/main.bicep rename to modules/web/hosting-environment/configurations--customdnssuffix/main.bicep diff --git a/modules/web/hosting-environments/configurations--customdnssuffix/main.json b/modules/web/hosting-environment/configurations--customdnssuffix/main.json similarity index 100% rename from modules/web/hosting-environments/configurations--customdnssuffix/main.json rename to modules/web/hosting-environment/configurations--customdnssuffix/main.json diff --git a/modules/web/hosting-environments/configurations--customdnssuffix/version.json b/modules/web/hosting-environment/configurations--customdnssuffix/version.json similarity index 100% rename from modules/web/hosting-environments/configurations--customdnssuffix/version.json rename to modules/web/hosting-environment/configurations--customdnssuffix/version.json diff --git a/modules/web/hosting-environments/configurations--networking/README.md b/modules/web/hosting-environment/configurations--networking/README.md similarity index 100% rename from modules/web/hosting-environments/configurations--networking/README.md rename to modules/web/hosting-environment/configurations--networking/README.md diff --git a/modules/web/hosting-environments/configurations--networking/main.bicep b/modules/web/hosting-environment/configurations--networking/main.bicep similarity index 100% rename from modules/web/hosting-environments/configurations--networking/main.bicep rename to modules/web/hosting-environment/configurations--networking/main.bicep diff --git a/modules/web/hosting-environments/configurations--networking/main.json b/modules/web/hosting-environment/configurations--networking/main.json similarity index 100% rename from modules/web/hosting-environments/configurations--networking/main.json rename to modules/web/hosting-environment/configurations--networking/main.json diff --git a/modules/web/hosting-environments/configurations--networking/version.json b/modules/web/hosting-environment/configurations--networking/version.json similarity index 100% rename from modules/web/hosting-environments/configurations--networking/version.json rename to modules/web/hosting-environment/configurations--networking/version.json diff --git a/modules/web/hosting-environments/main.bicep b/modules/web/hosting-environment/main.bicep similarity index 100% rename from modules/web/hosting-environments/main.bicep rename to modules/web/hosting-environment/main.bicep diff --git a/modules/web/hosting-environments/main.json b/modules/web/hosting-environment/main.json similarity index 100% rename from modules/web/hosting-environments/main.json rename to modules/web/hosting-environment/main.json diff --git a/modules/web/hosting-environments/version.json b/modules/web/hosting-environment/version.json similarity index 100% rename from modules/web/hosting-environments/version.json rename to modules/web/hosting-environment/version.json diff --git a/modules/web/serverfarms/.bicep/nested_roleAssignments.bicep b/modules/web/serverfarm/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/web/serverfarms/.bicep/nested_roleAssignments.bicep rename to modules/web/serverfarm/.bicep/nested_roleAssignments.bicep diff --git a/modules/web/serverfarms/.test/common/dependencies.bicep b/modules/web/serverfarm/.test/common/dependencies.bicep similarity index 100% rename from modules/web/serverfarms/.test/common/dependencies.bicep rename to modules/web/serverfarm/.test/common/dependencies.bicep diff --git a/modules/web/serverfarms/.test/common/main.test.bicep b/modules/web/serverfarm/.test/common/main.test.bicep similarity index 100% rename from modules/web/serverfarms/.test/common/main.test.bicep rename to modules/web/serverfarm/.test/common/main.test.bicep diff --git a/modules/web/serverfarms/.test/main.test.bicep b/modules/web/serverfarm/.test/main.test.bicep similarity index 100% rename from modules/web/serverfarms/.test/main.test.bicep rename to modules/web/serverfarm/.test/main.test.bicep diff --git a/modules/web/serverfarms/README.md b/modules/web/serverfarm/README.md similarity index 99% rename from modules/web/serverfarms/README.md rename to modules/web/serverfarm/README.md index baf04ba76c..0d9e6a4bb9 100644 --- a/modules/web/serverfarms/README.md +++ b/modules/web/serverfarm/README.md @@ -218,7 +218,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module serverfarms './web/serverfarms/main.bicep' = { +module serverfarms './web/serverfarm/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-wsfcom' params: { // Required parameters diff --git a/modules/web/serverfarms/main.bicep b/modules/web/serverfarm/main.bicep similarity index 100% rename from modules/web/serverfarms/main.bicep rename to modules/web/serverfarm/main.bicep diff --git a/modules/web/serverfarms/main.json b/modules/web/serverfarm/main.json similarity index 100% rename from modules/web/serverfarms/main.json rename to modules/web/serverfarm/main.json diff --git a/modules/web/serverfarms/version.json b/modules/web/serverfarm/version.json similarity index 100% rename from modules/web/serverfarms/version.json rename to modules/web/serverfarm/version.json diff --git a/modules/web/sites/.bicep/nested_roleAssignments.bicep b/modules/web/site/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/web/sites/.bicep/nested_roleAssignments.bicep rename to modules/web/site/.bicep/nested_roleAssignments.bicep diff --git a/modules/web/sites/.test/functionAppCommon/dependencies.bicep b/modules/web/site/.test/functionAppCommon/dependencies.bicep similarity index 100% rename from modules/web/sites/.test/functionAppCommon/dependencies.bicep rename to modules/web/site/.test/functionAppCommon/dependencies.bicep diff --git a/modules/web/sites/.test/functionAppCommon/main.test.bicep b/modules/web/site/.test/functionAppCommon/main.test.bicep similarity index 100% rename from modules/web/sites/.test/functionAppCommon/main.test.bicep rename to modules/web/site/.test/functionAppCommon/main.test.bicep diff --git a/modules/web/sites/.test/functionAppMin/dependencies.bicep b/modules/web/site/.test/functionAppMin/dependencies.bicep similarity index 100% rename from modules/web/sites/.test/functionAppMin/dependencies.bicep rename to modules/web/site/.test/functionAppMin/dependencies.bicep diff --git a/modules/web/sites/.test/functionAppMin/main.test.bicep b/modules/web/site/.test/functionAppMin/main.test.bicep similarity index 100% rename from modules/web/sites/.test/functionAppMin/main.test.bicep rename to modules/web/site/.test/functionAppMin/main.test.bicep diff --git a/modules/web/sites/.test/main.test.bicep b/modules/web/site/.test/main.test.bicep similarity index 100% rename from modules/web/sites/.test/main.test.bicep rename to modules/web/site/.test/main.test.bicep diff --git a/modules/web/sites/.test/webAppCommon/dependencies.bicep b/modules/web/site/.test/webAppCommon/dependencies.bicep similarity index 100% rename from modules/web/sites/.test/webAppCommon/dependencies.bicep rename to modules/web/site/.test/webAppCommon/dependencies.bicep diff --git a/modules/web/sites/.test/webAppCommon/main.test.bicep b/modules/web/site/.test/webAppCommon/main.test.bicep similarity index 100% rename from modules/web/sites/.test/webAppCommon/main.test.bicep rename to modules/web/site/.test/webAppCommon/main.test.bicep diff --git a/modules/web/sites/.test/webAppMin/dependencies.bicep b/modules/web/site/.test/webAppMin/dependencies.bicep similarity index 100% rename from modules/web/sites/.test/webAppMin/dependencies.bicep rename to modules/web/site/.test/webAppMin/dependencies.bicep diff --git a/modules/web/sites/.test/webAppMin/main.test.bicep b/modules/web/site/.test/webAppMin/main.test.bicep similarity index 100% rename from modules/web/sites/.test/webAppMin/main.test.bicep rename to modules/web/site/.test/webAppMin/main.test.bicep diff --git a/modules/web/sites/README.md b/modules/web/site/README.md similarity index 99% rename from modules/web/sites/README.md rename to modules/web/site/README.md index 4e01c6e0c8..abec3912a0 100644 --- a/modules/web/sites/README.md +++ b/modules/web/site/README.md @@ -456,7 +456,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module sites './web/sites/main.bicep' = { +module sites './web/site/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-wsfacom' params: { // Required parameters @@ -777,7 +777,7 @@ module sites './web/sites/main.bicep' = { via Bicep module ```bicep -module sites './web/sites/main.bicep' = { +module sites './web/site/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-wsfamin' params: { // Required parameters @@ -838,7 +838,7 @@ module sites './web/sites/main.bicep' = { via Bicep module ```bicep -module sites './web/sites/main.bicep' = { +module sites './web/site/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-wswa' params: { // Required parameters @@ -1137,7 +1137,7 @@ module sites './web/sites/main.bicep' = { via Bicep module ```bicep -module sites './web/sites/main.bicep' = { +module sites './web/site/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-wswamin' params: { // Required parameters diff --git a/modules/web/sites/basic-publishing-credentials-policies/README.md b/modules/web/site/basic-publishing-credentials-policies/README.md similarity index 100% rename from modules/web/sites/basic-publishing-credentials-policies/README.md rename to modules/web/site/basic-publishing-credentials-policies/README.md diff --git a/modules/web/sites/basic-publishing-credentials-policies/main.bicep b/modules/web/site/basic-publishing-credentials-policies/main.bicep similarity index 100% rename from modules/web/sites/basic-publishing-credentials-policies/main.bicep rename to modules/web/site/basic-publishing-credentials-policies/main.bicep diff --git a/modules/web/sites/basic-publishing-credentials-policies/main.json b/modules/web/site/basic-publishing-credentials-policies/main.json similarity index 100% rename from modules/web/sites/basic-publishing-credentials-policies/main.json rename to modules/web/site/basic-publishing-credentials-policies/main.json diff --git a/modules/web/sites/basic-publishing-credentials-policies/version.json b/modules/web/site/basic-publishing-credentials-policies/version.json similarity index 100% rename from modules/web/sites/basic-publishing-credentials-policies/version.json rename to modules/web/site/basic-publishing-credentials-policies/version.json diff --git a/modules/web/sites/config--appsettings/README.md b/modules/web/site/config--appsettings/README.md similarity index 100% rename from modules/web/sites/config--appsettings/README.md rename to modules/web/site/config--appsettings/README.md diff --git a/modules/web/sites/config--appsettings/main.bicep b/modules/web/site/config--appsettings/main.bicep similarity index 100% rename from modules/web/sites/config--appsettings/main.bicep rename to modules/web/site/config--appsettings/main.bicep diff --git a/modules/web/sites/config--appsettings/main.json b/modules/web/site/config--appsettings/main.json similarity index 100% rename from modules/web/sites/config--appsettings/main.json rename to modules/web/site/config--appsettings/main.json diff --git a/modules/web/sites/config--appsettings/version.json b/modules/web/site/config--appsettings/version.json similarity index 100% rename from modules/web/sites/config--appsettings/version.json rename to modules/web/site/config--appsettings/version.json diff --git a/modules/web/sites/config--authsettingsv2/README.md b/modules/web/site/config--authsettingsv2/README.md similarity index 100% rename from modules/web/sites/config--authsettingsv2/README.md rename to modules/web/site/config--authsettingsv2/README.md diff --git a/modules/web/sites/config--authsettingsv2/main.bicep b/modules/web/site/config--authsettingsv2/main.bicep similarity index 100% rename from modules/web/sites/config--authsettingsv2/main.bicep rename to modules/web/site/config--authsettingsv2/main.bicep diff --git a/modules/web/sites/config--authsettingsv2/main.json b/modules/web/site/config--authsettingsv2/main.json similarity index 100% rename from modules/web/sites/config--authsettingsv2/main.json rename to modules/web/site/config--authsettingsv2/main.json diff --git a/modules/web/sites/config--authsettingsv2/version.json b/modules/web/site/config--authsettingsv2/version.json similarity index 100% rename from modules/web/sites/config--authsettingsv2/version.json rename to modules/web/site/config--authsettingsv2/version.json diff --git a/modules/web/sites/hybrid-connection-namespaces/relays/README.md b/modules/web/site/hybrid-connection-namespaces/relays/README.md similarity index 100% rename from modules/web/sites/hybrid-connection-namespaces/relays/README.md rename to modules/web/site/hybrid-connection-namespaces/relays/README.md diff --git a/modules/web/sites/hybrid-connection-namespaces/relays/main.bicep b/modules/web/site/hybrid-connection-namespaces/relays/main.bicep similarity index 100% rename from modules/web/sites/hybrid-connection-namespaces/relays/main.bicep rename to modules/web/site/hybrid-connection-namespaces/relays/main.bicep diff --git a/modules/web/sites/hybrid-connection-namespaces/relays/main.json b/modules/web/site/hybrid-connection-namespaces/relays/main.json similarity index 100% rename from modules/web/sites/hybrid-connection-namespaces/relays/main.json rename to modules/web/site/hybrid-connection-namespaces/relays/main.json diff --git a/modules/web/sites/hybrid-connection-namespaces/relays/version.json b/modules/web/site/hybrid-connection-namespaces/relays/version.json similarity index 100% rename from modules/web/sites/hybrid-connection-namespaces/relays/version.json rename to modules/web/site/hybrid-connection-namespaces/relays/version.json diff --git a/modules/web/sites/main.bicep b/modules/web/site/main.bicep similarity index 97% rename from modules/web/sites/main.bicep rename to modules/web/site/main.bicep index e82fa6fd45..36cf695b68 100644 --- a/modules/web/sites/main.bicep +++ b/modules/web/site/main.bicep @@ -288,7 +288,7 @@ resource app 'Microsoft.Web/sites@2021-03-01' = { } } -module app_appsettings 'config--appsettings/main.bicep' = if (!empty(appSettingsKeyValuePairs)) { +module app_appsettings 'config--appsetting/main.bicep' = if (!empty(appSettingsKeyValuePairs)) { name: '${uniqueString(deployment().name, location)}-Site-Config-AppSettings' params: { appName: app.name @@ -312,7 +312,7 @@ module app_authsettingsv2 'config--authsettingsv2/main.bicep' = if (!empty(authS } @batchSize(1) -module app_slots 'slots/main.bicep' = [for (slot, index) in slots: { +module app_slots 'slot/main.bicep' = [for (slot, index) in slots: { name: '${uniqueString(deployment().name, location)}-Slot-${slot.name}' params: { name: slot.name @@ -365,7 +365,7 @@ module app_slots 'slots/main.bicep' = [for (slot, index) in slots: { } }] -module app_basicPublishingCredentialsPolicies 'basic-publishing-credentials-policies/main.bicep' = [for (basicPublishingCredentialsPolicy, index) in basicPublishingCredentialsPolicies: { +module app_basicPublishingCredentialsPolicies 'basic-publishing-credentials-policy/main.bicep' = [for (basicPublishingCredentialsPolicy, index) in basicPublishingCredentialsPolicies: { name: '${uniqueString(deployment().name, location)}-Site-Publis-Cred-${index}' params: { webAppName: app.name @@ -374,7 +374,7 @@ module app_basicPublishingCredentialsPolicies 'basic-publishing-credentials-poli } }] -module app_hybridConnectionRelays 'hybrid-connection-namespaces/relays/main.bicep' = [for (hybridConnectionRelay, index) in hybridConnectionRelays: { +module app_hybridConnectionRelays 'hybrid-connection-namespace/relay/main.bicep' = [for (hybridConnectionRelay, index) in hybridConnectionRelays: { name: '${uniqueString(deployment().name, location)}-HybridConnectionRelay-${index}' params: { hybridConnectionResourceId: hybridConnectionRelay.resourceId @@ -419,7 +419,7 @@ module app_roleAssignments '.bicep/nested_roleAssignments.bicep' = [for (roleAss } }] -module app_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module app_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-Site-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/web/sites/main.json b/modules/web/site/main.json similarity index 100% rename from modules/web/sites/main.json rename to modules/web/site/main.json diff --git a/modules/web/sites/slots/.bicep/nested_roleAssignments.bicep b/modules/web/site/slots/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/web/sites/slots/.bicep/nested_roleAssignments.bicep rename to modules/web/site/slots/.bicep/nested_roleAssignments.bicep diff --git a/modules/web/sites/slots/README.md b/modules/web/site/slots/README.md similarity index 100% rename from modules/web/sites/slots/README.md rename to modules/web/site/slots/README.md diff --git a/modules/web/sites/slots/config--appsettings/README.md b/modules/web/site/slots/config--appsettings/README.md similarity index 100% rename from modules/web/sites/slots/config--appsettings/README.md rename to modules/web/site/slots/config--appsettings/README.md diff --git a/modules/web/sites/slots/config--appsettings/main.bicep b/modules/web/site/slots/config--appsettings/main.bicep similarity index 100% rename from modules/web/sites/slots/config--appsettings/main.bicep rename to modules/web/site/slots/config--appsettings/main.bicep diff --git a/modules/web/sites/slots/config--appsettings/main.json b/modules/web/site/slots/config--appsettings/main.json similarity index 100% rename from modules/web/sites/slots/config--appsettings/main.json rename to modules/web/site/slots/config--appsettings/main.json diff --git a/modules/web/sites/slots/config--appsettings/version.json b/modules/web/site/slots/config--appsettings/version.json similarity index 100% rename from modules/web/sites/slots/config--appsettings/version.json rename to modules/web/site/slots/config--appsettings/version.json diff --git a/modules/web/sites/slots/config--authsettingsv2/README.md b/modules/web/site/slots/config--authsettingsv2/README.md similarity index 100% rename from modules/web/sites/slots/config--authsettingsv2/README.md rename to modules/web/site/slots/config--authsettingsv2/README.md diff --git a/modules/web/sites/slots/config--authsettingsv2/main.bicep b/modules/web/site/slots/config--authsettingsv2/main.bicep similarity index 100% rename from modules/web/sites/slots/config--authsettingsv2/main.bicep rename to modules/web/site/slots/config--authsettingsv2/main.bicep diff --git a/modules/web/sites/slots/config--authsettingsv2/main.json b/modules/web/site/slots/config--authsettingsv2/main.json similarity index 100% rename from modules/web/sites/slots/config--authsettingsv2/main.json rename to modules/web/site/slots/config--authsettingsv2/main.json diff --git a/modules/web/sites/slots/config--authsettingsv2/version.json b/modules/web/site/slots/config--authsettingsv2/version.json similarity index 100% rename from modules/web/sites/slots/config--authsettingsv2/version.json rename to modules/web/site/slots/config--authsettingsv2/version.json diff --git a/modules/web/sites/slots/hybrid-connection-namespaces/relays/README.md b/modules/web/site/slots/hybrid-connection-namespaces/relays/README.md similarity index 100% rename from modules/web/sites/slots/hybrid-connection-namespaces/relays/README.md rename to modules/web/site/slots/hybrid-connection-namespaces/relays/README.md diff --git a/modules/web/sites/slots/hybrid-connection-namespaces/relays/main.bicep b/modules/web/site/slots/hybrid-connection-namespaces/relays/main.bicep similarity index 100% rename from modules/web/sites/slots/hybrid-connection-namespaces/relays/main.bicep rename to modules/web/site/slots/hybrid-connection-namespaces/relays/main.bicep diff --git a/modules/web/sites/slots/hybrid-connection-namespaces/relays/main.json b/modules/web/site/slots/hybrid-connection-namespaces/relays/main.json similarity index 100% rename from modules/web/sites/slots/hybrid-connection-namespaces/relays/main.json rename to modules/web/site/slots/hybrid-connection-namespaces/relays/main.json diff --git a/modules/web/sites/slots/hybrid-connection-namespaces/relays/version.json b/modules/web/site/slots/hybrid-connection-namespaces/relays/version.json similarity index 100% rename from modules/web/sites/slots/hybrid-connection-namespaces/relays/version.json rename to modules/web/site/slots/hybrid-connection-namespaces/relays/version.json diff --git a/modules/web/sites/slots/main.bicep b/modules/web/site/slots/main.bicep similarity index 97% rename from modules/web/sites/slots/main.bicep rename to modules/web/site/slots/main.bicep index 91f39970d7..93e6228dd3 100644 --- a/modules/web/sites/slots/main.bicep +++ b/modules/web/site/slots/main.bicep @@ -300,7 +300,7 @@ resource slot 'Microsoft.Web/sites/slots@2022-03-01' = { } } -module slot_appsettings 'config--appsettings/main.bicep' = if (!empty(appSettingsKeyValuePairs)) { +module slot_appsettings 'config--appsetting/main.bicep' = if (!empty(appSettingsKeyValuePairs)) { name: '${uniqueString(deployment().name, location)}-Slot-${name}-Config-AppSettings' params: { slotName: slot.name @@ -325,7 +325,7 @@ module slot_authsettingsv2 'config--authsettingsv2/main.bicep' = if (!empty(auth } } -module slot_hybridConnectionRelays 'hybrid-connection-namespaces/relays/main.bicep' = [for (hybridConnectionRelay, index) in hybridConnectionRelays: { +module slot_hybridConnectionRelays 'hybrid-connection-namespace/relay/main.bicep' = [for (hybridConnectionRelay, index) in hybridConnectionRelays: { name: '${uniqueString(deployment().name, location)}-Slot-HybridConnectionRelay-${index}' params: { hybridConnectionResourceId: hybridConnectionRelay.resourceId @@ -369,7 +369,7 @@ module slot_rbac '.bicep/nested_roleAssignments.bicep' = [for (roleAssignment, i } }] -module slot_privateEndpoints '../../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module slot_privateEndpoints '../../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-Slot-${name}-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/web/sites/slots/main.json b/modules/web/site/slots/main.json similarity index 100% rename from modules/web/sites/slots/main.json rename to modules/web/site/slots/main.json diff --git a/modules/web/sites/slots/version.json b/modules/web/site/slots/version.json similarity index 100% rename from modules/web/sites/slots/version.json rename to modules/web/site/slots/version.json diff --git a/modules/web/sites/version.json b/modules/web/site/version.json similarity index 100% rename from modules/web/sites/version.json rename to modules/web/site/version.json diff --git a/modules/web/static-sites/.bicep/nested_roleAssignments.bicep b/modules/web/static-site/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/web/static-sites/.bicep/nested_roleAssignments.bicep rename to modules/web/static-site/.bicep/nested_roleAssignments.bicep diff --git a/modules/web/static-sites/.test/common/dependencies.bicep b/modules/web/static-site/.test/common/dependencies.bicep similarity index 100% rename from modules/web/static-sites/.test/common/dependencies.bicep rename to modules/web/static-site/.test/common/dependencies.bicep diff --git a/modules/web/static-sites/.test/common/main.test.bicep b/modules/web/static-site/.test/common/main.test.bicep similarity index 100% rename from modules/web/static-sites/.test/common/main.test.bicep rename to modules/web/static-site/.test/common/main.test.bicep diff --git a/modules/web/static-sites/.test/main.test.bicep b/modules/web/static-site/.test/main.test.bicep similarity index 100% rename from modules/web/static-sites/.test/main.test.bicep rename to modules/web/static-site/.test/main.test.bicep diff --git a/modules/web/static-sites/.test/min/main.test.bicep b/modules/web/static-site/.test/min/main.test.bicep similarity index 100% rename from modules/web/static-sites/.test/min/main.test.bicep rename to modules/web/static-site/.test/min/main.test.bicep diff --git a/modules/web/static-sites/README.md b/modules/web/static-site/README.md similarity index 99% rename from modules/web/static-sites/README.md rename to modules/web/static-site/README.md index 2cc1e18aea..a0c1ec292a 100644 --- a/modules/web/static-sites/README.md +++ b/modules/web/static-site/README.md @@ -358,7 +358,7 @@ The following module usage examples are retrieved from the content of the files via Bicep module ```bicep -module staticSites './web/static-sites/main.bicep' = { +module staticSites './web/static-site/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-wsscom' params: { // Required parameters @@ -525,7 +525,7 @@ module staticSites './web/static-sites/main.bicep' = { via Bicep module ```bicep -module staticSites './web/static-sites/main.bicep' = { +module staticSites './web/static-site/main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-wssmin' params: { // Required parameters diff --git a/modules/web/static-sites/config/README.md b/modules/web/static-site/config/README.md similarity index 100% rename from modules/web/static-sites/config/README.md rename to modules/web/static-site/config/README.md diff --git a/modules/web/static-sites/config/main.bicep b/modules/web/static-site/config/main.bicep similarity index 100% rename from modules/web/static-sites/config/main.bicep rename to modules/web/static-site/config/main.bicep diff --git a/modules/web/static-sites/config/main.json b/modules/web/static-site/config/main.json similarity index 100% rename from modules/web/static-sites/config/main.json rename to modules/web/static-site/config/main.json diff --git a/modules/web/static-sites/config/version.json b/modules/web/static-site/config/version.json similarity index 100% rename from modules/web/static-sites/config/version.json rename to modules/web/static-site/config/version.json diff --git a/modules/web/static-sites/custom-domains/README.md b/modules/web/static-site/custom-domains/README.md similarity index 100% rename from modules/web/static-sites/custom-domains/README.md rename to modules/web/static-site/custom-domains/README.md diff --git a/modules/web/static-sites/custom-domains/main.bicep b/modules/web/static-site/custom-domains/main.bicep similarity index 100% rename from modules/web/static-sites/custom-domains/main.bicep rename to modules/web/static-site/custom-domains/main.bicep diff --git a/modules/web/static-sites/custom-domains/main.json b/modules/web/static-site/custom-domains/main.json similarity index 100% rename from modules/web/static-sites/custom-domains/main.json rename to modules/web/static-site/custom-domains/main.json diff --git a/modules/web/static-sites/custom-domains/version.json b/modules/web/static-site/custom-domains/version.json similarity index 100% rename from modules/web/static-sites/custom-domains/version.json rename to modules/web/static-site/custom-domains/version.json diff --git a/modules/web/static-sites/linked-backends/README.md b/modules/web/static-site/linked-backends/README.md similarity index 100% rename from modules/web/static-sites/linked-backends/README.md rename to modules/web/static-site/linked-backends/README.md diff --git a/modules/web/static-sites/linked-backends/main.bicep b/modules/web/static-site/linked-backends/main.bicep similarity index 100% rename from modules/web/static-sites/linked-backends/main.bicep rename to modules/web/static-site/linked-backends/main.bicep diff --git a/modules/web/static-sites/linked-backends/main.json b/modules/web/static-site/linked-backends/main.json similarity index 100% rename from modules/web/static-sites/linked-backends/main.json rename to modules/web/static-site/linked-backends/main.json diff --git a/modules/web/static-sites/linked-backends/version.json b/modules/web/static-site/linked-backends/version.json similarity index 100% rename from modules/web/static-sites/linked-backends/version.json rename to modules/web/static-site/linked-backends/version.json diff --git a/modules/web/static-sites/main.bicep b/modules/web/static-site/main.bicep similarity index 97% rename from modules/web/static-sites/main.bicep rename to modules/web/static-site/main.bicep index 39df432e86..7d8344e1d2 100644 --- a/modules/web/static-sites/main.bicep +++ b/modules/web/static-site/main.bicep @@ -136,7 +136,7 @@ resource staticSite 'Microsoft.Web/staticSites@2021-03-01' = { } } -module staticSite_linkedBackend 'linked-backends/main.bicep' = if (!empty(linkedBackend)) { +module staticSite_linkedBackend 'linked-backend/main.bicep' = if (!empty(linkedBackend)) { name: '${uniqueString(deployment().name, location)}-StaticSite-UserDefinedFunction' params: { staticSiteName: staticSite.name @@ -166,7 +166,7 @@ module staticSite_functionAppSettings 'config/main.bicep' = if (!empty(functionA } } -module staticSite_customDomains 'custom-domains/main.bicep' = [for (customDomain, index) in customDomains: { +module staticSite_customDomains 'custom-domain/main.bicep' = [for (customDomain, index) in customDomains: { name: '${uniqueString(deployment().name, location)}-StaticSite-customDomains-${index}' params: { name: customDomain @@ -194,7 +194,7 @@ module staticSite_roleAssignments '.bicep/nested_roleAssignments.bicep' = [for ( } }] -module staticSite_privateEndpoints '../../network/private-endpoints/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { +module staticSite_privateEndpoints '../../network/private-endpoint/main.bicep' = [for (privateEndpoint, index) in privateEndpoints: { name: '${uniqueString(deployment().name, location)}-StaticSite-PrivateEndpoint-${index}' params: { groupIds: [ diff --git a/modules/web/static-sites/main.json b/modules/web/static-site/main.json similarity index 100% rename from modules/web/static-sites/main.json rename to modules/web/static-site/main.json diff --git a/modules/web/static-sites/version.json b/modules/web/static-site/version.json similarity index 100% rename from modules/web/static-sites/version.json rename to modules/web/static-site/version.json diff --git a/rtMapping.jsonc b/rtMapping.jsonc index 07fc0bb184..451a8a5b74 100644 --- a/rtMapping.jsonc +++ b/rtMapping.jsonc @@ -36,6 +36,7 @@ "backend-address-pools": "backend-address-pool", "backends": "backend", "backup-config": "backup-config", + "backup-fabrics": "backup-fabric", "backup-long-term-retention-policies": "backup-long-term-retention-policy", "backup-policies": "backup-policy", "backup-short-term-retention-policies": "backup-short-term-retention-policy", @@ -265,6 +266,7 @@ "virtual-wans": "virtual-wan", "virtualnetworks": "virtualnetwork", "volumes": "volume", + "vpn-connections": "vpn-connection", "vpn-gateways": "vpn-gateway", "vpn-sites": "vpn-site", "vulnerability-assessments": "vulnerability-assessment", From 872288601527bcfa3cdeeb9616e7bbb4e67f8e28 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Fri, 11 Aug 2023 20:55:08 +0200 Subject: [PATCH 02/15] second run --- modules/api-management/service/api/{policies => policy}/README.md | 0 .../api-management/service/api/{policies => policy}/main.bicep | 0 modules/api-management/service/api/{policies => policy}/main.json | 0 .../api-management/service/api/{policies => policy}/version.json | 0 modules/api-management/service/product/{apis => api}/README.md | 0 modules/api-management/service/product/{apis => api}/main.bicep | 0 modules/api-management/service/product/{apis => api}/main.json | 0 modules/api-management/service/product/{apis => api}/version.json | 0 .../api-management/service/product/{groups => group}/README.md | 0 .../api-management/service/product/{groups => group}/main.bicep | 0 .../api-management/service/product/{groups => group}/main.json | 0 .../api-management/service/product/{groups => group}/version.json | 0 .../{key-values => key-value}/.bicep/nested_roleAssignments.bicep | 0 .../configuration-store/{key-values => key-value}/README.md | 0 .../configuration-store/{key-values => key-value}/main.bicep | 0 .../configuration-store/{key-values => key-value}/main.json | 0 .../configuration-store/{key-values => key-value}/version.json | 0 .../automation-account/{job-schedules => job-schedule}/README.md | 0 .../automation-account/{job-schedules => job-schedule}/main.bicep | 0 .../automation-account/{job-schedules => job-schedule}/main.json | 0 .../{job-schedules => job-schedule}/version.json | 0 .../automation/automation-account/{modules => module}/README.md | 0 .../automation/automation-account/{modules => module}/main.bicep | 0 .../automation/automation-account/{modules => module}/main.json | 0 .../automation-account/{modules => module}/version.json | 0 .../automation/automation-account/{runbooks => runbook}/README.md | 0 .../automation-account/{runbooks => runbook}/main.bicep | 0 .../automation/automation-account/{runbooks => runbook}/main.json | 0 .../automation-account/{runbooks => runbook}/version.json | 0 .../automation-account/{schedules => schedule}/README.md | 0 .../automation-account/{schedules => schedule}/main.bicep | 0 .../automation-account/{schedules => schedule}/main.json | 0 .../automation-account/{schedules => schedule}/version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../automation-account/{variables => variable}/README.md | 0 .../automation-account/{variables => variable}/main.bicep | 0 .../automation-account/{variables => variable}/main.json | 0 .../automation-account/{variables => variable}/version.json | 0 modules/cdn/profiles/endpoint/{origins => origin}/README.md | 0 modules/cdn/profiles/endpoint/{origins => origin}/main.bicep | 0 modules/cdn/profiles/endpoint/{origins => origin}/main.json | 0 modules/cdn/profiles/endpoint/{origins => origin}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 modules/compute/gallery/{applications => application}/README.md | 0 modules/compute/gallery/{applications => application}/main.bicep | 0 modules/compute/gallery/{applications => application}/main.json | 0 .../compute/gallery/{applications => application}/version.json | 0 .../gallery/{images => image}/.bicep/nested_roleAssignments.bicep | 0 modules/compute/gallery/{images => image}/README.md | 0 modules/compute/gallery/{images => image}/main.bicep | 0 modules/compute/gallery/{images => image}/main.json | 0 modules/compute/gallery/{images => image}/version.json | 0 .../virtual-machine-scale-set/{extensions => extension}/README.md | 0 .../{extensions => extension}/main.bicep | 0 .../virtual-machine-scale-set/{extensions => extension}/main.json | 0 .../{extensions => extension}/version.json | 0 .../compute/virtual-machine/{extensions => extension}/README.md | 0 .../compute/virtual-machine/{extensions => extension}/main.bicep | 0 .../compute/virtual-machine/{extensions => extension}/main.json | 0 .../virtual-machine/{extensions => extension}/version.json | 0 .../registry/{replications => replication}/README.md | 0 .../registry/{replications => replication}/main.bicep | 0 .../registry/{replications => replication}/main.json | 0 .../registry/{replications => replication}/version.json | 0 .../container-registry/registry/{webhooks => webhook}/README.md | 0 .../container-registry/registry/{webhooks => webhook}/main.bicep | 0 .../container-registry/registry/{webhooks => webhook}/main.json | 0 .../registry/{webhooks => webhook}/version.json | 0 .../managed-cluster/{agent-pools => agent-pool}/README.md | 0 .../managed-cluster/{agent-pools => agent-pool}/main.bicep | 0 .../managed-cluster/{agent-pools => agent-pool}/main.json | 0 .../managed-cluster/{agent-pools => agent-pool}/version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../backup-vault/{backup-policies => backup-policy}/README.md | 0 .../backup-vault/{backup-policies => backup-policy}/main.bicep | 0 .../backup-vault/{backup-policies => backup-policy}/main.json | 0 .../backup-vault/{backup-policies => backup-policy}/version.json | 0 .../flexible-server/{databases => database}/README.md | 0 .../flexible-server/{databases => database}/main.bicep | 0 .../flexible-server/{databases => database}/main.json | 0 .../flexible-server/{databases => database}/version.json | 0 .../flexible-server/{firewall-rules => firewall-rule}/README.md | 0 .../flexible-server/{firewall-rules => firewall-rule}/main.bicep | 0 .../flexible-server/{firewall-rules => firewall-rule}/main.json | 0 .../{firewall-rules => firewall-rule}/version.json | 0 .../flexible-server/{configurations => configuration}/README.md | 0 .../flexible-server/{configurations => configuration}/main.bicep | 0 .../flexible-server/{configurations => configuration}/main.json | 0 .../{configurations => configuration}/version.json | 0 .../flexible-server/{databases => database}/README.md | 0 .../flexible-server/{databases => database}/main.bicep | 0 .../flexible-server/{databases => database}/main.json | 0 .../flexible-server/{databases => database}/version.json | 0 .../flexible-server/{firewall-rules => firewall-rule}/README.md | 0 .../flexible-server/{firewall-rules => firewall-rule}/main.bicep | 0 .../flexible-server/{firewall-rules => firewall-rule}/main.json | 0 .../{firewall-rules => firewall-rule}/version.json | 0 .../application-group/{applications => application}/README.md | 0 .../application-group/{applications => application}/main.bicep | 0 .../application-group/{applications => application}/main.json | 0 .../application-group/{applications => application}/version.json | 0 .../lab/{artifactsources => artifactsource}/README.md | 0 .../lab/{artifactsources => artifactsource}/main.bicep | 0 .../lab/{artifactsources => artifactsource}/main.json | 0 .../lab/{artifactsources => artifactsource}/version.json | 0 modules/dev-test-lab/lab/{costs => cost}/README.md | 0 modules/dev-test-lab/lab/{costs => cost}/main.bicep | 0 modules/dev-test-lab/lab/{costs => cost}/main.json | 0 modules/dev-test-lab/lab/{costs => cost}/version.json | 0 .../lab/{notificationchannels => notificationchannel}/README.md | 0 .../lab/{notificationchannels => notificationchannel}/main.bicep | 0 .../lab/{notificationchannels => notificationchannel}/main.json | 0 .../{notificationchannels => notificationchannel}/version.json | 0 .../dev-test-lab/lab/{policysets => policyset}/policies/README.md | 0 .../lab/{policysets => policyset}/policies/main.bicep | 0 .../dev-test-lab/lab/{policysets => policyset}/policies/main.json | 0 .../lab/{policysets => policyset}/policies/version.json | 0 modules/dev-test-lab/lab/{schedules => schedule}/README.md | 0 modules/dev-test-lab/lab/{schedules => schedule}/main.bicep | 0 modules/dev-test-lab/lab/{schedules => schedule}/main.json | 0 modules/dev-test-lab/lab/{schedules => schedule}/version.json | 0 .../lab/{virtualnetworks => virtualnetwork}/README.md | 0 .../lab/{virtualnetworks => virtualnetwork}/main.bicep | 0 .../lab/{virtualnetworks => virtualnetwork}/main.json | 0 .../lab/{virtualnetworks => virtualnetwork}/version.json | 0 .../{gremlin-databases => gremlin-database}/README.md | 0 .../{gremlin-databases => gremlin-database}/graphs/README.md | 0 .../{gremlin-databases => gremlin-database}/graphs/main.bicep | 0 .../{gremlin-databases => gremlin-database}/graphs/main.json | 0 .../{gremlin-databases => gremlin-database}/graphs/version.json | 0 .../{gremlin-databases => gremlin-database}/main.bicep | 0 .../{gremlin-databases => gremlin-database}/main.json | 0 .../{gremlin-databases => gremlin-database}/version.json | 0 .../{mongodb-databases => mongodb-database}/README.md | 0 .../{mongodb-databases => mongodb-database}/collections/README.md | 0 .../collections/main.bicep | 0 .../{mongodb-databases => mongodb-database}/collections/main.json | 0 .../collections/version.json | 0 .../{mongodb-databases => mongodb-database}/main.bicep | 0 .../{mongodb-databases => mongodb-database}/main.json | 0 .../{mongodb-databases => mongodb-database}/version.json | 0 .../database-account/{sql-databases => sql-database}/README.md | 0 .../{sql-databases => sql-database}/containers/README.md | 0 .../{sql-databases => sql-database}/containers/main.bicep | 0 .../{sql-databases => sql-database}/containers/main.json | 0 .../{sql-databases => sql-database}/containers/version.json | 0 .../database-account/{sql-databases => sql-database}/main.bicep | 0 .../database-account/{sql-databases => sql-database}/main.json | 0 .../database-account/{sql-databases => sql-database}/version.json | 0 modules/event-grid/domain/{topics => topic}/README.md | 0 modules/event-grid/domain/{topics => topic}/main.bicep | 0 modules/event-grid/domain/{topics => topic}/main.json | 0 modules/event-grid/domain/{topics => topic}/version.json | 0 .../{eventSubscriptions => eventSubscription}/README.md | 0 .../{eventSubscriptions => eventSubscription}/main.bicep | 0 .../{eventSubscriptions => eventSubscription}/main.json | 0 .../{eventSubscriptions => eventSubscription}/version.json | 0 .../topic/{eventSubscriptions => eventSubscription}/README.md | 0 .../topic/{eventSubscriptions => eventSubscription}/main.bicep | 0 .../topic/{eventSubscriptions => eventSubscription}/main.json | 0 .../topic/{eventSubscriptions => eventSubscription}/version.json | 0 .../{authorization-rules => authorization-rule}/README.md | 0 .../{authorization-rules => authorization-rule}/main.bicep | 0 .../{authorization-rules => authorization-rule}/main.json | 0 .../{authorization-rules => authorization-rule}/version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../{eventhubs => eventhub}/.bicep/nested_roleAssignments.bicep | 0 modules/event-hub/namespace/{eventhubs => eventhub}/README.md | 0 .../{eventhubs => eventhub}/authorization-rules/README.md | 0 .../{eventhubs => eventhub}/authorization-rules/main.bicep | 0 .../{eventhubs => eventhub}/authorization-rules/main.json | 0 .../{eventhubs => eventhub}/authorization-rules/version.json | 0 .../namespace/{eventhubs => eventhub}/consumergroups/README.md | 0 .../namespace/{eventhubs => eventhub}/consumergroups/main.bicep | 0 .../namespace/{eventhubs => eventhub}/consumergroups/main.json | 0 .../namespace/{eventhubs => eventhub}/consumergroups/version.json | 0 modules/event-hub/namespace/{eventhubs => eventhub}/main.bicep | 0 modules/event-hub/namespace/{eventhubs => eventhub}/main.json | 0 modules/event-hub/namespace/{eventhubs => eventhub}/version.json | 0 .../namespace/{network-rule-sets => network-rule-set}/README.md | 0 .../namespace/{network-rule-sets => network-rule-set}/main.bicep | 0 .../namespace/{network-rule-sets => network-rule-set}/main.json | 0 .../{network-rule-sets => network-rule-set}/version.json | 0 .../workspace/{dicomservices => dicomservice}/README.md | 0 .../workspace/{dicomservices => dicomservice}/main.bicep | 0 .../workspace/{dicomservices => dicomservice}/main.json | 0 .../workspace/{dicomservices => dicomservice}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../workspace/{fhirservices => fhirservice}/README.md | 0 .../workspace/{fhirservices => fhirservice}/main.bicep | 0 .../workspace/{fhirservices => fhirservice}/main.json | 0 .../workspace/{fhirservices => fhirservice}/version.json | 0 .../workspace/{iotconnectors => iotconnector}/README.md | 0 .../{iotconnectors => iotconnector}/fhirdestinations/README.md | 0 .../{iotconnectors => iotconnector}/fhirdestinations/main.bicep | 0 .../{iotconnectors => iotconnector}/fhirdestinations/main.json | 0 .../{iotconnectors => iotconnector}/fhirdestinations/version.json | 0 .../workspace/{iotconnectors => iotconnector}/main.bicep | 0 .../workspace/{iotconnectors => iotconnector}/main.json | 0 .../workspace/{iotconnectors => iotconnector}/version.json | 0 .../{scoped-resources => scoped-resource}/README.md | 0 .../{scoped-resources => scoped-resource}/main.bicep | 0 .../{scoped-resources => scoped-resource}/main.json | 0 .../{scoped-resources => scoped-resource}/version.json | 0 .../key-vault/vault/{access-policies => access-policy}/README.md | 0 .../key-vault/vault/{access-policies => access-policy}/main.bicep | 0 .../key-vault/vault/{access-policies => access-policy}/main.json | 0 .../vault/{access-policies => access-policy}/version.json | 0 .../vault/{keys => key}/.bicep/nested_roleAssignments.bicep | 0 modules/key-vault/vault/{keys => key}/README.md | 0 modules/key-vault/vault/{keys => key}/main.bicep | 0 modules/key-vault/vault/{keys => key}/main.json | 0 modules/key-vault/vault/{keys => key}/version.json | 0 .../vault/{secrets => secret}/.bicep/nested_roleAssignments.bicep | 0 modules/key-vault/vault/{secrets => secret}/README.md | 0 modules/key-vault/vault/{secrets => secret}/main.bicep | 0 modules/key-vault/vault/{secrets => secret}/main.json | 0 modules/key-vault/vault/{secrets => secret}/version.json | 0 .../workspace/{computes => compute}/README.md | 0 .../workspace/{computes => compute}/main.bicep | 0 .../workspace/{computes => compute}/main.json | 0 .../workspace/{computes => compute}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../net-app-account/{capacity-pools => capacity-pool}/README.md | 0 .../net-app-account/{capacity-pools => capacity-pool}/main.bicep | 0 .../net-app-account/{capacity-pools => capacity-pool}/main.json | 0 .../{capacity-pools => capacity-pool}/version.json | 0 .../volumes/.bicep/nested_roleAssignments.bicep | 0 .../{capacity-pools => capacity-pool}/volumes/README.md | 0 .../{capacity-pools => capacity-pool}/volumes/main.bicep | 0 .../{capacity-pools => capacity-pool}/volumes/main.json | 0 .../{capacity-pools => capacity-pool}/volumes/version.json | 0 .../{forwarding-rules => forwarding-rule}/README.md | 0 .../{forwarding-rules => forwarding-rule}/main.bicep | 0 .../{forwarding-rules => forwarding-rule}/main.json | 0 .../{forwarding-rules => forwarding-rule}/version.json | 0 .../{virtual-network-links => virtual-network-link}/README.md | 0 .../{virtual-network-links => virtual-network-link}/main.bicep | 0 .../{virtual-network-links => virtual-network-link}/main.json | 0 .../{virtual-network-links => virtual-network-link}/version.json | 0 .../{rule-collection-groups => rule-collection-group}/README.md | 0 .../{rule-collection-groups => rule-collection-group}/main.bicep | 0 .../{rule-collection-groups => rule-collection-group}/main.json | 0 .../version.json | 0 .../{backend-address-pools => backend-address-pool}/README.md | 0 .../{backend-address-pools => backend-address-pool}/main.bicep | 0 .../{backend-address-pools => backend-address-pool}/main.json | 0 .../{backend-address-pools => backend-address-pool}/version.json | 0 .../{inbound-nat-rules => inbound-nat-rule}/README.md | 0 .../{inbound-nat-rules => inbound-nat-rule}/main.bicep | 0 .../{inbound-nat-rules => inbound-nat-rule}/main.json | 0 .../{inbound-nat-rules => inbound-nat-rule}/version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../network-manager/{network-groups => network-group}/README.md | 0 .../network-manager/{network-groups => network-group}/main.bicep | 0 .../network-manager/{network-groups => network-group}/main.json | 0 .../{network-groups => network-group}/static-members/README.md | 0 .../{network-groups => network-group}/static-members/main.bicep | 0 .../{network-groups => network-group}/static-members/main.json | 0 .../{network-groups => network-group}/static-members/version.json | 0 .../{network-groups => network-group}/version.json | 0 .../{scope-connections => scope-connection}/README.md | 0 .../{scope-connections => scope-connection}/main.bicep | 0 .../{scope-connections => scope-connection}/main.json | 0 .../{scope-connections => scope-connection}/version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../rule-collections/README.md | 0 .../rule-collections/main.bicep | 0 .../rule-collections/main.json | 0 .../rule-collections/rules/README.md | 0 .../rule-collections/rules/main.bicep | 0 .../rule-collections/rules/main.json | 0 .../rule-collections/rules/version.json | 0 .../rule-collections/version.json | 0 .../version.json | 0 .../{security-rules => security-rule}/README.md | 0 .../{security-rules => security-rule}/main.bicep | 0 .../{security-rules => security-rule}/main.json | 0 .../{security-rules => security-rule}/version.json | 0 .../{connection-monitors => connection-monitor}/README.md | 0 .../{connection-monitors => connection-monitor}/main.bicep | 0 .../{connection-monitors => connection-monitor}/main.json | 0 .../{connection-monitors => connection-monitor}/version.json | 0 modules/network/network-watcher/{flow-logs => flow-log}/README.md | 0 .../network/network-watcher/{flow-logs => flow-log}/main.bicep | 0 modules/network/network-watcher/{flow-logs => flow-log}/main.json | 0 .../network/network-watcher/{flow-logs => flow-log}/version.json | 0 .../{virtual-network-links => virtual-network-link}/README.md | 0 .../{virtual-network-links => virtual-network-link}/main.bicep | 0 .../{virtual-network-links => virtual-network-link}/main.json | 0 .../{virtual-network-links => virtual-network-link}/version.json | 0 .../{private-dns-zone-groups => private-dns-zone-group}/README.md | 0 .../main.bicep | 0 .../{private-dns-zone-groups => private-dns-zone-group}/main.json | 0 .../version.json | 0 .../virtual-hub/{hub-route-tables => hub-route-table}/README.md | 0 .../virtual-hub/{hub-route-tables => hub-route-table}/main.bicep | 0 .../virtual-hub/{hub-route-tables => hub-route-table}/main.json | 0 .../{hub-route-tables => hub-route-table}/version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../virtual-network-gateway/{nat-rules => nat-rule}/README.md | 0 .../virtual-network-gateway/{nat-rules => nat-rule}/main.bicep | 0 .../virtual-network-gateway/{nat-rules => nat-rule}/main.json | 0 .../virtual-network-gateway/{nat-rules => nat-rule}/version.json | 0 .../{subnets => subnet}/.bicep/nested_roleAssignments.bicep | 0 modules/network/virtual-network/{subnets => subnet}/README.md | 0 modules/network/virtual-network/{subnets => subnet}/main.bicep | 0 modules/network/virtual-network/{subnets => subnet}/main.json | 0 modules/network/virtual-network/{subnets => subnet}/version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 modules/network/vpn-gateway/{nat-rules => nat-rule}/README.md | 0 modules/network/vpn-gateway/{nat-rules => nat-rule}/main.bicep | 0 modules/network/vpn-gateway/{nat-rules => nat-rule}/main.json | 0 modules/network/vpn-gateway/{nat-rules => nat-rule}/version.json | 0 .../workspace/{data-exports => data-export}/README.md | 0 .../workspace/{data-exports => data-export}/main.bicep | 0 .../workspace/{data-exports => data-export}/main.json | 0 .../workspace/{data-exports => data-export}/version.json | 0 .../workspace/{data-sources => data-source}/README.md | 0 .../workspace/{data-sources => data-source}/main.bicep | 0 .../workspace/{data-sources => data-source}/main.json | 0 .../workspace/{data-sources => data-source}/version.json | 0 .../workspace/{linked-services => linked-service}/README.md | 0 .../workspace/{linked-services => linked-service}/main.bicep | 0 .../workspace/{linked-services => linked-service}/main.json | 0 .../workspace/{linked-services => linked-service}/version.json | 0 .../{linked-storage-accounts => linked-storage-account}/README.md | 0 .../main.bicep | 0 .../{linked-storage-accounts => linked-storage-account}/main.json | 0 .../version.json | 0 .../workspace/{saved-searches => saved-searche}/README.md | 0 .../workspace/{saved-searches => saved-searche}/main.bicep | 0 .../workspace/{saved-searches => saved-searche}/main.json | 0 .../workspace/{saved-searches => saved-searche}/version.json | 0 .../{storage-insight-configs => storage-insight-config}/README.md | 0 .../main.bicep | 0 .../{storage-insight-configs => storage-insight-config}/main.json | 0 .../version.json | 0 .../operational-insights/workspace/{tables => table}/README.md | 0 .../operational-insights/workspace/{tables => table}/main.bicep | 0 .../operational-insights/workspace/{tables => table}/main.json | 0 .../operational-insights/workspace/{tables => table}/version.json | 0 .../{protection-containers => protection-container}/README.md | 0 .../{protection-containers => protection-container}/main.bicep | 0 .../{protection-containers => protection-container}/main.json | 0 .../protected-items/README.md | 0 .../protected-items/main.bicep | 0 .../protected-items/main.json | 0 .../protected-items/version.json | 0 .../{protection-containers => protection-container}/version.json | 0 .../vault/{backup-policies => backup-policy}/README.md | 0 .../vault/{backup-policies => backup-policy}/main.bicep | 0 .../vault/{backup-policies => backup-policy}/main.json | 0 .../vault/{backup-policies => backup-policy}/version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../vault/{replication-fabrics => replication-fabric}/README.md | 0 .../vault/{replication-fabrics => replication-fabric}/main.bicep | 0 .../vault/{replication-fabrics => replication-fabric}/main.json | 0 .../replication-protection-containers/README.md | 0 .../replication-protection-containers/main.bicep | 0 .../replication-protection-containers/main.json | 0 .../replication-protection-container-mappings/README.md | 0 .../replication-protection-container-mappings/main.bicep | 0 .../replication-protection-container-mappings/main.json | 0 .../replication-protection-container-mappings/version.json | 0 .../replication-protection-containers/version.json | 0 .../{replication-fabrics => replication-fabric}/version.json | 0 .../vault/{replication-policies => replication-policy}/README.md | 0 .../vault/{replication-policies => replication-policy}/main.bicep | 0 .../vault/{replication-policies => replication-policy}/main.json | 0 .../{replication-policies => replication-policy}/version.json | 0 .../{authorization-rules => authorization-rule}/README.md | 0 .../{authorization-rules => authorization-rule}/main.bicep | 0 .../{authorization-rules => authorization-rule}/main.json | 0 .../{authorization-rules => authorization-rule}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../namespace/{hybrid-connections => hybrid-connection}/README.md | 0 .../authorization-rules/README.md | 0 .../authorization-rules/main.bicep | 0 .../authorization-rules/main.json | 0 .../authorization-rules/version.json | 0 .../{hybrid-connections => hybrid-connection}/main.bicep | 0 .../namespace/{hybrid-connections => hybrid-connection}/main.json | 0 .../{hybrid-connections => hybrid-connection}/version.json | 0 .../namespace/{network-rule-sets => network-rule-set}/README.md | 0 .../namespace/{network-rule-sets => network-rule-set}/main.bicep | 0 .../namespace/{network-rule-sets => network-rule-set}/main.json | 0 .../{network-rule-sets => network-rule-set}/version.json | 0 .../{wcf-relays => wcf-relay}/.bicep/nested_roleAssignments.bicep | 0 modules/relay/namespace/{wcf-relays => wcf-relay}/README.md | 0 .../{wcf-relays => wcf-relay}/authorization-rules/README.md | 0 .../{wcf-relays => wcf-relay}/authorization-rules/main.bicep | 0 .../{wcf-relays => wcf-relay}/authorization-rules/main.json | 0 .../{wcf-relays => wcf-relay}/authorization-rules/version.json | 0 modules/relay/namespace/{wcf-relays => wcf-relay}/main.bicep | 0 modules/relay/namespace/{wcf-relays => wcf-relay}/main.json | 0 modules/relay/namespace/{wcf-relays => wcf-relay}/version.json | 0 .../{authorization-rules => authorization-rule}/README.md | 0 .../{authorization-rules => authorization-rule}/main.bicep | 0 .../{authorization-rules => authorization-rule}/main.json | 0 .../{authorization-rules => authorization-rule}/version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../namespace/{network-rule-sets => network-rule-set}/README.md | 0 .../namespace/{network-rule-sets => network-rule-set}/main.bicep | 0 .../namespace/{network-rule-sets => network-rule-set}/main.json | 0 .../{network-rule-sets => network-rule-set}/version.json | 0 .../{queues => queue}/.bicep/nested_roleAssignments.bicep | 0 modules/service-bus/namespace/{queues => queue}/README.md | 0 .../namespace/{queues => queue}/authorization-rules/README.md | 0 .../namespace/{queues => queue}/authorization-rules/main.bicep | 0 .../namespace/{queues => queue}/authorization-rules/main.json | 0 .../namespace/{queues => queue}/authorization-rules/version.json | 0 modules/service-bus/namespace/{queues => queue}/main.bicep | 0 modules/service-bus/namespace/{queues => queue}/main.json | 0 modules/service-bus/namespace/{queues => queue}/version.json | 0 .../{topics => topic}/.bicep/nested_roleAssignments.bicep | 0 modules/service-bus/namespace/{topics => topic}/README.md | 0 .../namespace/{topics => topic}/authorization-rules/README.md | 0 .../namespace/{topics => topic}/authorization-rules/main.bicep | 0 .../namespace/{topics => topic}/authorization-rules/main.json | 0 .../namespace/{topics => topic}/authorization-rules/version.json | 0 modules/service-bus/namespace/{topics => topic}/main.bicep | 0 modules/service-bus/namespace/{topics => topic}/main.json | 0 modules/service-bus/namespace/{topics => topic}/version.json | 0 .../cluster/{application-types => application-type}/README.md | 0 .../cluster/{application-types => application-type}/main.bicep | 0 .../cluster/{application-types => application-type}/main.json | 0 .../cluster/{application-types => application-type}/version.json | 0 .../managed-instance/{administrators => administrator}/README.md | 0 .../managed-instance/{administrators => administrator}/main.bicep | 0 .../managed-instance/{administrators => administrator}/main.json | 0 .../{administrators => administrator}/version.json | 0 modules/sql/managed-instance/{databases => database}/README.md | 0 .../backup-long-term-retention-policies/README.md | 0 .../backup-long-term-retention-policies/main.bicep | 0 .../backup-long-term-retention-policies/main.json | 0 .../backup-long-term-retention-policies/version.json | 0 .../backup-short-term-retention-policies/README.md | 0 .../backup-short-term-retention-policies/main.bicep | 0 .../backup-short-term-retention-policies/main.json | 0 .../backup-short-term-retention-policies/version.json | 0 modules/sql/managed-instance/{databases => database}/main.bicep | 0 modules/sql/managed-instance/{databases => database}/main.json | 0 modules/sql/managed-instance/{databases => database}/version.json | 0 modules/sql/managed-instance/{keys => key}/README.md | 0 modules/sql/managed-instance/{keys => key}/main.bicep | 0 modules/sql/managed-instance/{keys => key}/main.json | 0 modules/sql/managed-instance/{keys => key}/version.json | 0 .../{security-alert-policies => security-alert-policy}/README.md | 0 .../{security-alert-policies => security-alert-policy}/main.bicep | 0 .../{security-alert-policies => security-alert-policy}/main.json | 0 .../version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 modules/sql/server/{databases => database}/README.md | 0 .../backup-long-term-retention-policies/README.md | 0 .../backup-long-term-retention-policies/main.bicep | 0 .../backup-long-term-retention-policies/main.json | 0 .../backup-long-term-retention-policies/version.json | 0 .../backup-short-term-retention-policies/README.md | 0 .../backup-short-term-retention-policies/main.bicep | 0 .../backup-short-term-retention-policies/main.json | 0 .../backup-short-term-retention-policies/version.json | 0 modules/sql/server/{databases => database}/main.bicep | 0 modules/sql/server/{databases => database}/main.json | 0 modules/sql/server/{databases => database}/version.json | 0 modules/sql/server/{elastic-pools => elastic-pool}/README.md | 0 modules/sql/server/{elastic-pools => elastic-pool}/main.bicep | 0 modules/sql/server/{elastic-pools => elastic-pool}/main.json | 0 modules/sql/server/{elastic-pools => elastic-pool}/version.json | 0 modules/sql/server/{firewall-rules => firewall-rule}/README.md | 0 modules/sql/server/{firewall-rules => firewall-rule}/main.bicep | 0 modules/sql/server/{firewall-rules => firewall-rule}/main.json | 0 modules/sql/server/{firewall-rules => firewall-rule}/version.json | 0 modules/sql/server/{keys => key}/README.md | 0 modules/sql/server/{keys => key}/main.bicep | 0 modules/sql/server/{keys => key}/main.json | 0 modules/sql/server/{keys => key}/version.json | 0 .../{security-alert-policies => security-alert-policy}/README.md | 0 .../{security-alert-policies => security-alert-policy}/main.bicep | 0 .../{security-alert-policies => security-alert-policy}/main.json | 0 .../version.json | 0 .../{virtual-network-rules => virtual-network-rule}/README.md | 0 .../{virtual-network-rules => virtual-network-rule}/main.bicep | 0 .../{virtual-network-rules => virtual-network-rule}/main.json | 0 .../{virtual-network-rules => virtual-network-rule}/version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../storage-account/{blob-services => blob-service}/README.md | 0 .../containers/.bicep/nested_roleAssignments.bicep | 0 .../{blob-services => blob-service}/containers/README.md | 0 .../containers/immutability-policies/README.md | 0 .../containers/immutability-policies/main.bicep | 0 .../containers/immutability-policies/main.json | 0 .../containers/immutability-policies/version.json | 0 .../{blob-services => blob-service}/containers/main.bicep | 0 .../{blob-services => blob-service}/containers/main.json | 0 .../{blob-services => blob-service}/containers/version.json | 0 .../storage-account/{blob-services => blob-service}/main.bicep | 0 .../storage-account/{blob-services => blob-service}/main.json | 0 .../storage-account/{blob-services => blob-service}/version.json | 0 .../storage-account/{file-services => file-service}/README.md | 0 .../storage-account/{file-services => file-service}/main.bicep | 0 .../storage-account/{file-services => file-service}/main.json | 0 .../shares/.bicep/nested_roleAssignments.bicep | 0 .../{file-services => file-service}/shares/README.md | 0 .../{file-services => file-service}/shares/main.bicep | 0 .../{file-services => file-service}/shares/main.json | 0 .../{file-services => file-service}/shares/version.json | 0 .../storage-account/{file-services => file-service}/version.json | 0 .../storage/storage-account/{local-users => local-user}/README.md | 0 .../storage-account/{local-users => local-user}/main.bicep | 0 .../storage/storage-account/{local-users => local-user}/main.json | 0 .../storage-account/{local-users => local-user}/version.json | 0 .../{management-policies => management-policy}/README.md | 0 .../{management-policies => management-policy}/main.bicep | 0 .../{management-policies => management-policy}/main.json | 0 .../{management-policies => management-policy}/version.json | 0 .../storage-account/{queue-services => queue-service}/README.md | 0 .../storage-account/{queue-services => queue-service}/main.bicep | 0 .../storage-account/{queue-services => queue-service}/main.json | 0 .../queues/.bicep/nested_roleAssignments.bicep | 0 .../{queue-services => queue-service}/queues/README.md | 0 .../{queue-services => queue-service}/queues/main.bicep | 0 .../{queue-services => queue-service}/queues/main.json | 0 .../{queue-services => queue-service}/queues/version.json | 0 .../{queue-services => queue-service}/version.json | 0 .../storage-account/{table-services => table-service}/README.md | 0 .../storage-account/{table-services => table-service}/main.bicep | 0 .../storage-account/{table-services => table-service}/main.json | 0 .../{table-services => table-service}/tables/README.md | 0 .../{table-services => table-service}/tables/main.bicep | 0 .../{table-services => table-service}/tables/main.json | 0 .../{table-services => table-service}/tables/version.json | 0 .../{table-services => table-service}/version.json | 0 .../{integration-runtimes => integration-runtime}/README.md | 0 .../{integration-runtimes => integration-runtime}/main.bicep | 0 .../{integration-runtimes => integration-runtime}/main.json | 0 .../{integration-runtimes => integration-runtime}/version.json | 0 modules/synapse/workspace/{keys => key}/README.md | 0 modules/synapse/workspace/{keys => key}/main.bicep | 0 modules/synapse/workspace/{keys => key}/main.json | 0 modules/synapse/workspace/{keys => key}/version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../site/{config--appsettings => config--appsetting}/README.md | 0 .../site/{config--appsettings => config--appsetting}/main.bicep | 0 .../site/{config--appsettings => config--appsetting}/main.json | 0 .../site/{config--appsettings => config--appsetting}/version.json | 0 .../relays/README.md | 0 .../relays/main.bicep | 0 .../relays/main.json | 0 .../relays/version.json | 0 .../web/site/{slots => slot}/.bicep/nested_roleAssignments.bicep | 0 modules/web/site/{slots => slot}/README.md | 0 modules/web/site/{slots => slot}/config--appsettings/README.md | 0 modules/web/site/{slots => slot}/config--appsettings/main.bicep | 0 modules/web/site/{slots => slot}/config--appsettings/main.json | 0 modules/web/site/{slots => slot}/config--appsettings/version.json | 0 modules/web/site/{slots => slot}/config--authsettingsv2/README.md | 0 .../web/site/{slots => slot}/config--authsettingsv2/main.bicep | 0 modules/web/site/{slots => slot}/config--authsettingsv2/main.json | 0 .../web/site/{slots => slot}/config--authsettingsv2/version.json | 0 .../{slots => slot}/hybrid-connection-namespaces/relays/README.md | 0 .../hybrid-connection-namespaces/relays/main.bicep | 0 .../{slots => slot}/hybrid-connection-namespaces/relays/main.json | 0 .../hybrid-connection-namespaces/relays/version.json | 0 modules/web/site/{slots => slot}/main.bicep | 0 modules/web/site/{slots => slot}/main.json | 0 modules/web/site/{slots => slot}/version.json | 0 .../web/static-site/{custom-domains => custom-domain}/README.md | 0 .../web/static-site/{custom-domains => custom-domain}/main.bicep | 0 .../web/static-site/{custom-domains => custom-domain}/main.json | 0 .../static-site/{custom-domains => custom-domain}/version.json | 0 .../web/static-site/{linked-backends => linked-backend}/README.md | 0 .../static-site/{linked-backends => linked-backend}/main.bicep | 0 .../web/static-site/{linked-backends => linked-backend}/main.json | 0 .../static-site/{linked-backends => linked-backend}/version.json | 0 614 files changed, 0 insertions(+), 0 deletions(-) rename modules/api-management/service/api/{policies => policy}/README.md (100%) rename modules/api-management/service/api/{policies => policy}/main.bicep (100%) rename modules/api-management/service/api/{policies => policy}/main.json (100%) rename modules/api-management/service/api/{policies => policy}/version.json (100%) rename modules/api-management/service/product/{apis => api}/README.md (100%) rename modules/api-management/service/product/{apis => api}/main.bicep (100%) rename modules/api-management/service/product/{apis => api}/main.json (100%) rename modules/api-management/service/product/{apis => api}/version.json (100%) rename modules/api-management/service/product/{groups => group}/README.md (100%) rename modules/api-management/service/product/{groups => group}/main.bicep (100%) rename modules/api-management/service/product/{groups => group}/main.json (100%) rename modules/api-management/service/product/{groups => group}/version.json (100%) rename modules/app-configuration/configuration-store/{key-values => key-value}/.bicep/nested_roleAssignments.bicep (100%) rename modules/app-configuration/configuration-store/{key-values => key-value}/README.md (100%) rename modules/app-configuration/configuration-store/{key-values => key-value}/main.bicep (100%) rename modules/app-configuration/configuration-store/{key-values => key-value}/main.json (100%) rename modules/app-configuration/configuration-store/{key-values => key-value}/version.json (100%) rename modules/automation/automation-account/{job-schedules => job-schedule}/README.md (100%) rename modules/automation/automation-account/{job-schedules => job-schedule}/main.bicep (100%) rename modules/automation/automation-account/{job-schedules => job-schedule}/main.json (100%) rename modules/automation/automation-account/{job-schedules => job-schedule}/version.json (100%) rename modules/automation/automation-account/{modules => module}/README.md (100%) rename modules/automation/automation-account/{modules => module}/main.bicep (100%) rename modules/automation/automation-account/{modules => module}/main.json (100%) rename modules/automation/automation-account/{modules => module}/version.json (100%) rename modules/automation/automation-account/{runbooks => runbook}/README.md (100%) rename modules/automation/automation-account/{runbooks => runbook}/main.bicep (100%) rename modules/automation/automation-account/{runbooks => runbook}/main.json (100%) rename modules/automation/automation-account/{runbooks => runbook}/version.json (100%) rename modules/automation/automation-account/{schedules => schedule}/README.md (100%) rename modules/automation/automation-account/{schedules => schedule}/main.bicep (100%) rename modules/automation/automation-account/{schedules => schedule}/main.json (100%) rename modules/automation/automation-account/{schedules => schedule}/version.json (100%) rename modules/automation/automation-account/{software-update-configurations => software-update-configuration}/README.md (100%) rename modules/automation/automation-account/{software-update-configurations => software-update-configuration}/main.bicep (100%) rename modules/automation/automation-account/{software-update-configurations => software-update-configuration}/main.json (100%) rename modules/automation/automation-account/{software-update-configurations => software-update-configuration}/version.json (100%) rename modules/automation/automation-account/{variables => variable}/README.md (100%) rename modules/automation/automation-account/{variables => variable}/main.bicep (100%) rename modules/automation/automation-account/{variables => variable}/main.json (100%) rename modules/automation/automation-account/{variables => variable}/version.json (100%) rename modules/cdn/profiles/endpoint/{origins => origin}/README.md (100%) rename modules/cdn/profiles/endpoint/{origins => origin}/main.bicep (100%) rename modules/cdn/profiles/endpoint/{origins => origin}/main.json (100%) rename modules/cdn/profiles/endpoint/{origins => origin}/version.json (100%) rename modules/compute/gallery/{applications => application}/.bicep/nested_roleAssignments.bicep (100%) rename modules/compute/gallery/{applications => application}/README.md (100%) rename modules/compute/gallery/{applications => application}/main.bicep (100%) rename modules/compute/gallery/{applications => application}/main.json (100%) rename modules/compute/gallery/{applications => application}/version.json (100%) rename modules/compute/gallery/{images => image}/.bicep/nested_roleAssignments.bicep (100%) rename modules/compute/gallery/{images => image}/README.md (100%) rename modules/compute/gallery/{images => image}/main.bicep (100%) rename modules/compute/gallery/{images => image}/main.json (100%) rename modules/compute/gallery/{images => image}/version.json (100%) rename modules/compute/virtual-machine-scale-set/{extensions => extension}/README.md (100%) rename modules/compute/virtual-machine-scale-set/{extensions => extension}/main.bicep (100%) rename modules/compute/virtual-machine-scale-set/{extensions => extension}/main.json (100%) rename modules/compute/virtual-machine-scale-set/{extensions => extension}/version.json (100%) rename modules/compute/virtual-machine/{extensions => extension}/README.md (100%) rename modules/compute/virtual-machine/{extensions => extension}/main.bicep (100%) rename modules/compute/virtual-machine/{extensions => extension}/main.json (100%) rename modules/compute/virtual-machine/{extensions => extension}/version.json (100%) rename modules/container-registry/registry/{replications => replication}/README.md (100%) rename modules/container-registry/registry/{replications => replication}/main.bicep (100%) rename modules/container-registry/registry/{replications => replication}/main.json (100%) rename modules/container-registry/registry/{replications => replication}/version.json (100%) rename modules/container-registry/registry/{webhooks => webhook}/README.md (100%) rename modules/container-registry/registry/{webhooks => webhook}/main.bicep (100%) rename modules/container-registry/registry/{webhooks => webhook}/main.json (100%) rename modules/container-registry/registry/{webhooks => webhook}/version.json (100%) rename modules/container-service/managed-cluster/{agent-pools => agent-pool}/README.md (100%) rename modules/container-service/managed-cluster/{agent-pools => agent-pool}/main.bicep (100%) rename modules/container-service/managed-cluster/{agent-pools => agent-pool}/main.json (100%) rename modules/container-service/managed-cluster/{agent-pools => agent-pool}/version.json (100%) rename modules/data-factory/factories/managed-virtual-network/{managed-private-endpoints => managed-private-endpoint}/README.md (100%) rename modules/data-factory/factories/managed-virtual-network/{managed-private-endpoints => managed-private-endpoint}/main.bicep (100%) rename modules/data-factory/factories/managed-virtual-network/{managed-private-endpoints => managed-private-endpoint}/main.json (100%) rename modules/data-factory/factories/managed-virtual-network/{managed-private-endpoints => managed-private-endpoint}/version.json (100%) rename modules/data-protection/backup-vault/{backup-policies => backup-policy}/README.md (100%) rename modules/data-protection/backup-vault/{backup-policies => backup-policy}/main.bicep (100%) rename modules/data-protection/backup-vault/{backup-policies => backup-policy}/main.json (100%) rename modules/data-protection/backup-vault/{backup-policies => backup-policy}/version.json (100%) rename modules/db-for-my-sql/flexible-server/{databases => database}/README.md (100%) rename modules/db-for-my-sql/flexible-server/{databases => database}/main.bicep (100%) rename modules/db-for-my-sql/flexible-server/{databases => database}/main.json (100%) rename modules/db-for-my-sql/flexible-server/{databases => database}/version.json (100%) rename modules/db-for-my-sql/flexible-server/{firewall-rules => firewall-rule}/README.md (100%) rename modules/db-for-my-sql/flexible-server/{firewall-rules => firewall-rule}/main.bicep (100%) rename modules/db-for-my-sql/flexible-server/{firewall-rules => firewall-rule}/main.json (100%) rename modules/db-for-my-sql/flexible-server/{firewall-rules => firewall-rule}/version.json (100%) rename modules/db-for-postgre-sql/flexible-server/{configurations => configuration}/README.md (100%) rename modules/db-for-postgre-sql/flexible-server/{configurations => configuration}/main.bicep (100%) rename modules/db-for-postgre-sql/flexible-server/{configurations => configuration}/main.json (100%) rename modules/db-for-postgre-sql/flexible-server/{configurations => configuration}/version.json (100%) rename modules/db-for-postgre-sql/flexible-server/{databases => database}/README.md (100%) rename modules/db-for-postgre-sql/flexible-server/{databases => database}/main.bicep (100%) rename modules/db-for-postgre-sql/flexible-server/{databases => database}/main.json (100%) rename modules/db-for-postgre-sql/flexible-server/{databases => database}/version.json (100%) rename modules/db-for-postgre-sql/flexible-server/{firewall-rules => firewall-rule}/README.md (100%) rename modules/db-for-postgre-sql/flexible-server/{firewall-rules => firewall-rule}/main.bicep (100%) rename modules/db-for-postgre-sql/flexible-server/{firewall-rules => firewall-rule}/main.json (100%) rename modules/db-for-postgre-sql/flexible-server/{firewall-rules => firewall-rule}/version.json (100%) rename modules/desktop-virtualization/application-group/{applications => application}/README.md (100%) rename modules/desktop-virtualization/application-group/{applications => application}/main.bicep (100%) rename modules/desktop-virtualization/application-group/{applications => application}/main.json (100%) rename modules/desktop-virtualization/application-group/{applications => application}/version.json (100%) rename modules/dev-test-lab/lab/{artifactsources => artifactsource}/README.md (100%) rename modules/dev-test-lab/lab/{artifactsources => artifactsource}/main.bicep (100%) rename modules/dev-test-lab/lab/{artifactsources => artifactsource}/main.json (100%) rename modules/dev-test-lab/lab/{artifactsources => artifactsource}/version.json (100%) rename modules/dev-test-lab/lab/{costs => cost}/README.md (100%) rename modules/dev-test-lab/lab/{costs => cost}/main.bicep (100%) rename modules/dev-test-lab/lab/{costs => cost}/main.json (100%) rename modules/dev-test-lab/lab/{costs => cost}/version.json (100%) rename modules/dev-test-lab/lab/{notificationchannels => notificationchannel}/README.md (100%) rename modules/dev-test-lab/lab/{notificationchannels => notificationchannel}/main.bicep (100%) rename modules/dev-test-lab/lab/{notificationchannels => notificationchannel}/main.json (100%) rename modules/dev-test-lab/lab/{notificationchannels => notificationchannel}/version.json (100%) rename modules/dev-test-lab/lab/{policysets => policyset}/policies/README.md (100%) rename modules/dev-test-lab/lab/{policysets => policyset}/policies/main.bicep (100%) rename modules/dev-test-lab/lab/{policysets => policyset}/policies/main.json (100%) rename modules/dev-test-lab/lab/{policysets => policyset}/policies/version.json (100%) rename modules/dev-test-lab/lab/{schedules => schedule}/README.md (100%) rename modules/dev-test-lab/lab/{schedules => schedule}/main.bicep (100%) rename modules/dev-test-lab/lab/{schedules => schedule}/main.json (100%) rename modules/dev-test-lab/lab/{schedules => schedule}/version.json (100%) rename modules/dev-test-lab/lab/{virtualnetworks => virtualnetwork}/README.md (100%) rename modules/dev-test-lab/lab/{virtualnetworks => virtualnetwork}/main.bicep (100%) rename modules/dev-test-lab/lab/{virtualnetworks => virtualnetwork}/main.json (100%) rename modules/dev-test-lab/lab/{virtualnetworks => virtualnetwork}/version.json (100%) rename modules/document-db/database-account/{gremlin-databases => gremlin-database}/README.md (100%) rename modules/document-db/database-account/{gremlin-databases => gremlin-database}/graphs/README.md (100%) rename modules/document-db/database-account/{gremlin-databases => gremlin-database}/graphs/main.bicep (100%) rename modules/document-db/database-account/{gremlin-databases => gremlin-database}/graphs/main.json (100%) rename modules/document-db/database-account/{gremlin-databases => gremlin-database}/graphs/version.json (100%) rename modules/document-db/database-account/{gremlin-databases => gremlin-database}/main.bicep (100%) rename modules/document-db/database-account/{gremlin-databases => gremlin-database}/main.json (100%) rename modules/document-db/database-account/{gremlin-databases => gremlin-database}/version.json (100%) rename modules/document-db/database-account/{mongodb-databases => mongodb-database}/README.md (100%) rename modules/document-db/database-account/{mongodb-databases => mongodb-database}/collections/README.md (100%) rename modules/document-db/database-account/{mongodb-databases => mongodb-database}/collections/main.bicep (100%) rename modules/document-db/database-account/{mongodb-databases => mongodb-database}/collections/main.json (100%) rename modules/document-db/database-account/{mongodb-databases => mongodb-database}/collections/version.json (100%) rename modules/document-db/database-account/{mongodb-databases => mongodb-database}/main.bicep (100%) rename modules/document-db/database-account/{mongodb-databases => mongodb-database}/main.json (100%) rename modules/document-db/database-account/{mongodb-databases => mongodb-database}/version.json (100%) rename modules/document-db/database-account/{sql-databases => sql-database}/README.md (100%) rename modules/document-db/database-account/{sql-databases => sql-database}/containers/README.md (100%) rename modules/document-db/database-account/{sql-databases => sql-database}/containers/main.bicep (100%) rename modules/document-db/database-account/{sql-databases => sql-database}/containers/main.json (100%) rename modules/document-db/database-account/{sql-databases => sql-database}/containers/version.json (100%) rename modules/document-db/database-account/{sql-databases => sql-database}/main.bicep (100%) rename modules/document-db/database-account/{sql-databases => sql-database}/main.json (100%) rename modules/document-db/database-account/{sql-databases => sql-database}/version.json (100%) rename modules/event-grid/domain/{topics => topic}/README.md (100%) rename modules/event-grid/domain/{topics => topic}/main.bicep (100%) rename modules/event-grid/domain/{topics => topic}/main.json (100%) rename modules/event-grid/domain/{topics => topic}/version.json (100%) rename modules/event-grid/system-topic/{eventSubscriptions => eventSubscription}/README.md (100%) rename modules/event-grid/system-topic/{eventSubscriptions => eventSubscription}/main.bicep (100%) rename modules/event-grid/system-topic/{eventSubscriptions => eventSubscription}/main.json (100%) rename modules/event-grid/system-topic/{eventSubscriptions => eventSubscription}/version.json (100%) rename modules/event-grid/topic/{eventSubscriptions => eventSubscription}/README.md (100%) rename modules/event-grid/topic/{eventSubscriptions => eventSubscription}/main.bicep (100%) rename modules/event-grid/topic/{eventSubscriptions => eventSubscription}/main.json (100%) rename modules/event-grid/topic/{eventSubscriptions => eventSubscription}/version.json (100%) rename modules/event-hub/namespace/{authorization-rules => authorization-rule}/README.md (100%) rename modules/event-hub/namespace/{authorization-rules => authorization-rule}/main.bicep (100%) rename modules/event-hub/namespace/{authorization-rules => authorization-rule}/main.json (100%) rename modules/event-hub/namespace/{authorization-rules => authorization-rule}/version.json (100%) rename modules/event-hub/namespace/{disaster-recovery-configs => disaster-recovery-config}/README.md (100%) rename modules/event-hub/namespace/{disaster-recovery-configs => disaster-recovery-config}/main.bicep (100%) rename modules/event-hub/namespace/{disaster-recovery-configs => disaster-recovery-config}/main.json (100%) rename modules/event-hub/namespace/{disaster-recovery-configs => disaster-recovery-config}/version.json (100%) rename modules/event-hub/namespace/{eventhubs => eventhub}/.bicep/nested_roleAssignments.bicep (100%) rename modules/event-hub/namespace/{eventhubs => eventhub}/README.md (100%) rename modules/event-hub/namespace/{eventhubs => eventhub}/authorization-rules/README.md (100%) rename modules/event-hub/namespace/{eventhubs => eventhub}/authorization-rules/main.bicep (100%) rename modules/event-hub/namespace/{eventhubs => eventhub}/authorization-rules/main.json (100%) rename modules/event-hub/namespace/{eventhubs => eventhub}/authorization-rules/version.json (100%) rename modules/event-hub/namespace/{eventhubs => eventhub}/consumergroups/README.md (100%) rename modules/event-hub/namespace/{eventhubs => eventhub}/consumergroups/main.bicep (100%) rename modules/event-hub/namespace/{eventhubs => eventhub}/consumergroups/main.json (100%) rename modules/event-hub/namespace/{eventhubs => eventhub}/consumergroups/version.json (100%) rename modules/event-hub/namespace/{eventhubs => eventhub}/main.bicep (100%) rename modules/event-hub/namespace/{eventhubs => eventhub}/main.json (100%) rename modules/event-hub/namespace/{eventhubs => eventhub}/version.json (100%) rename modules/event-hub/namespace/{network-rule-sets => network-rule-set}/README.md (100%) rename modules/event-hub/namespace/{network-rule-sets => network-rule-set}/main.bicep (100%) rename modules/event-hub/namespace/{network-rule-sets => network-rule-set}/main.json (100%) rename modules/event-hub/namespace/{network-rule-sets => network-rule-set}/version.json (100%) rename modules/healthcare-apis/workspace/{dicomservices => dicomservice}/README.md (100%) rename modules/healthcare-apis/workspace/{dicomservices => dicomservice}/main.bicep (100%) rename modules/healthcare-apis/workspace/{dicomservices => dicomservice}/main.json (100%) rename modules/healthcare-apis/workspace/{dicomservices => dicomservice}/version.json (100%) rename modules/healthcare-apis/workspace/{fhirservices => fhirservice}/.bicep/nested_roleAssignments.bicep (100%) rename modules/healthcare-apis/workspace/{fhirservices => fhirservice}/README.md (100%) rename modules/healthcare-apis/workspace/{fhirservices => fhirservice}/main.bicep (100%) rename modules/healthcare-apis/workspace/{fhirservices => fhirservice}/main.json (100%) rename modules/healthcare-apis/workspace/{fhirservices => fhirservice}/version.json (100%) rename modules/healthcare-apis/workspace/{iotconnectors => iotconnector}/README.md (100%) rename modules/healthcare-apis/workspace/{iotconnectors => iotconnector}/fhirdestinations/README.md (100%) rename modules/healthcare-apis/workspace/{iotconnectors => iotconnector}/fhirdestinations/main.bicep (100%) rename modules/healthcare-apis/workspace/{iotconnectors => iotconnector}/fhirdestinations/main.json (100%) rename modules/healthcare-apis/workspace/{iotconnectors => iotconnector}/fhirdestinations/version.json (100%) rename modules/healthcare-apis/workspace/{iotconnectors => iotconnector}/main.bicep (100%) rename modules/healthcare-apis/workspace/{iotconnectors => iotconnector}/main.json (100%) rename modules/healthcare-apis/workspace/{iotconnectors => iotconnector}/version.json (100%) rename modules/insights/private-link-scope/{scoped-resources => scoped-resource}/README.md (100%) rename modules/insights/private-link-scope/{scoped-resources => scoped-resource}/main.bicep (100%) rename modules/insights/private-link-scope/{scoped-resources => scoped-resource}/main.json (100%) rename modules/insights/private-link-scope/{scoped-resources => scoped-resource}/version.json (100%) rename modules/key-vault/vault/{access-policies => access-policy}/README.md (100%) rename modules/key-vault/vault/{access-policies => access-policy}/main.bicep (100%) rename modules/key-vault/vault/{access-policies => access-policy}/main.json (100%) rename modules/key-vault/vault/{access-policies => access-policy}/version.json (100%) rename modules/key-vault/vault/{keys => key}/.bicep/nested_roleAssignments.bicep (100%) rename modules/key-vault/vault/{keys => key}/README.md (100%) rename modules/key-vault/vault/{keys => key}/main.bicep (100%) rename modules/key-vault/vault/{keys => key}/main.json (100%) rename modules/key-vault/vault/{keys => key}/version.json (100%) rename modules/key-vault/vault/{secrets => secret}/.bicep/nested_roleAssignments.bicep (100%) rename modules/key-vault/vault/{secrets => secret}/README.md (100%) rename modules/key-vault/vault/{secrets => secret}/main.bicep (100%) rename modules/key-vault/vault/{secrets => secret}/main.json (100%) rename modules/key-vault/vault/{secrets => secret}/version.json (100%) rename modules/machine-learning-services/workspace/{computes => compute}/README.md (100%) rename modules/machine-learning-services/workspace/{computes => compute}/main.bicep (100%) rename modules/machine-learning-services/workspace/{computes => compute}/main.json (100%) rename modules/machine-learning-services/workspace/{computes => compute}/version.json (100%) rename modules/net-app/net-app-account/{capacity-pools => capacity-pool}/.bicep/nested_roleAssignments.bicep (100%) rename modules/net-app/net-app-account/{capacity-pools => capacity-pool}/README.md (100%) rename modules/net-app/net-app-account/{capacity-pools => capacity-pool}/main.bicep (100%) rename modules/net-app/net-app-account/{capacity-pools => capacity-pool}/main.json (100%) rename modules/net-app/net-app-account/{capacity-pools => capacity-pool}/version.json (100%) rename modules/net-app/net-app-account/{capacity-pools => capacity-pool}/volumes/.bicep/nested_roleAssignments.bicep (100%) rename modules/net-app/net-app-account/{capacity-pools => capacity-pool}/volumes/README.md (100%) rename modules/net-app/net-app-account/{capacity-pools => capacity-pool}/volumes/main.bicep (100%) rename modules/net-app/net-app-account/{capacity-pools => capacity-pool}/volumes/main.json (100%) rename modules/net-app/net-app-account/{capacity-pools => capacity-pool}/volumes/version.json (100%) rename modules/network/dns-forwarding-ruleset/{forwarding-rules => forwarding-rule}/README.md (100%) rename modules/network/dns-forwarding-ruleset/{forwarding-rules => forwarding-rule}/main.bicep (100%) rename modules/network/dns-forwarding-ruleset/{forwarding-rules => forwarding-rule}/main.json (100%) rename modules/network/dns-forwarding-ruleset/{forwarding-rules => forwarding-rule}/version.json (100%) rename modules/network/dns-forwarding-ruleset/{virtual-network-links => virtual-network-link}/README.md (100%) rename modules/network/dns-forwarding-ruleset/{virtual-network-links => virtual-network-link}/main.bicep (100%) rename modules/network/dns-forwarding-ruleset/{virtual-network-links => virtual-network-link}/main.json (100%) rename modules/network/dns-forwarding-ruleset/{virtual-network-links => virtual-network-link}/version.json (100%) rename modules/network/firewall-policy/{rule-collection-groups => rule-collection-group}/README.md (100%) rename modules/network/firewall-policy/{rule-collection-groups => rule-collection-group}/main.bicep (100%) rename modules/network/firewall-policy/{rule-collection-groups => rule-collection-group}/main.json (100%) rename modules/network/firewall-policy/{rule-collection-groups => rule-collection-group}/version.json (100%) rename modules/network/load-balancer/{backend-address-pools => backend-address-pool}/README.md (100%) rename modules/network/load-balancer/{backend-address-pools => backend-address-pool}/main.bicep (100%) rename modules/network/load-balancer/{backend-address-pools => backend-address-pool}/main.json (100%) rename modules/network/load-balancer/{backend-address-pools => backend-address-pool}/version.json (100%) rename modules/network/load-balancer/{inbound-nat-rules => inbound-nat-rule}/README.md (100%) rename modules/network/load-balancer/{inbound-nat-rules => inbound-nat-rule}/main.bicep (100%) rename modules/network/load-balancer/{inbound-nat-rules => inbound-nat-rule}/main.json (100%) rename modules/network/load-balancer/{inbound-nat-rules => inbound-nat-rule}/version.json (100%) rename modules/network/network-manager/{connectivity-configurations => connectivity-configuration}/README.md (100%) rename modules/network/network-manager/{connectivity-configurations => connectivity-configuration}/main.bicep (100%) rename modules/network/network-manager/{connectivity-configurations => connectivity-configuration}/main.json (100%) rename modules/network/network-manager/{connectivity-configurations => connectivity-configuration}/version.json (100%) rename modules/network/network-manager/{network-groups => network-group}/README.md (100%) rename modules/network/network-manager/{network-groups => network-group}/main.bicep (100%) rename modules/network/network-manager/{network-groups => network-group}/main.json (100%) rename modules/network/network-manager/{network-groups => network-group}/static-members/README.md (100%) rename modules/network/network-manager/{network-groups => network-group}/static-members/main.bicep (100%) rename modules/network/network-manager/{network-groups => network-group}/static-members/main.json (100%) rename modules/network/network-manager/{network-groups => network-group}/static-members/version.json (100%) rename modules/network/network-manager/{network-groups => network-group}/version.json (100%) rename modules/network/network-manager/{scope-connections => scope-connection}/README.md (100%) rename modules/network/network-manager/{scope-connections => scope-connection}/main.bicep (100%) rename modules/network/network-manager/{scope-connections => scope-connection}/main.json (100%) rename modules/network/network-manager/{scope-connections => scope-connection}/version.json (100%) rename modules/network/network-manager/{security-admin-configurations => security-admin-configuration}/README.md (100%) rename modules/network/network-manager/{security-admin-configurations => security-admin-configuration}/main.bicep (100%) rename modules/network/network-manager/{security-admin-configurations => security-admin-configuration}/main.json (100%) rename modules/network/network-manager/{security-admin-configurations => security-admin-configuration}/rule-collections/README.md (100%) rename modules/network/network-manager/{security-admin-configurations => security-admin-configuration}/rule-collections/main.bicep (100%) rename modules/network/network-manager/{security-admin-configurations => security-admin-configuration}/rule-collections/main.json (100%) rename modules/network/network-manager/{security-admin-configurations => security-admin-configuration}/rule-collections/rules/README.md (100%) rename modules/network/network-manager/{security-admin-configurations => security-admin-configuration}/rule-collections/rules/main.bicep (100%) rename modules/network/network-manager/{security-admin-configurations => security-admin-configuration}/rule-collections/rules/main.json (100%) rename modules/network/network-manager/{security-admin-configurations => security-admin-configuration}/rule-collections/rules/version.json (100%) rename modules/network/network-manager/{security-admin-configurations => security-admin-configuration}/rule-collections/version.json (100%) rename modules/network/network-manager/{security-admin-configurations => security-admin-configuration}/version.json (100%) rename modules/network/network-security-group/{security-rules => security-rule}/README.md (100%) rename modules/network/network-security-group/{security-rules => security-rule}/main.bicep (100%) rename modules/network/network-security-group/{security-rules => security-rule}/main.json (100%) rename modules/network/network-security-group/{security-rules => security-rule}/version.json (100%) rename modules/network/network-watcher/{connection-monitors => connection-monitor}/README.md (100%) rename modules/network/network-watcher/{connection-monitors => connection-monitor}/main.bicep (100%) rename modules/network/network-watcher/{connection-monitors => connection-monitor}/main.json (100%) rename modules/network/network-watcher/{connection-monitors => connection-monitor}/version.json (100%) rename modules/network/network-watcher/{flow-logs => flow-log}/README.md (100%) rename modules/network/network-watcher/{flow-logs => flow-log}/main.bicep (100%) rename modules/network/network-watcher/{flow-logs => flow-log}/main.json (100%) rename modules/network/network-watcher/{flow-logs => flow-log}/version.json (100%) rename modules/network/private-dns-zone/{virtual-network-links => virtual-network-link}/README.md (100%) rename modules/network/private-dns-zone/{virtual-network-links => virtual-network-link}/main.bicep (100%) rename modules/network/private-dns-zone/{virtual-network-links => virtual-network-link}/main.json (100%) rename modules/network/private-dns-zone/{virtual-network-links => virtual-network-link}/version.json (100%) rename modules/network/private-endpoint/{private-dns-zone-groups => private-dns-zone-group}/README.md (100%) rename modules/network/private-endpoint/{private-dns-zone-groups => private-dns-zone-group}/main.bicep (100%) rename modules/network/private-endpoint/{private-dns-zone-groups => private-dns-zone-group}/main.json (100%) rename modules/network/private-endpoint/{private-dns-zone-groups => private-dns-zone-group}/version.json (100%) rename modules/network/virtual-hub/{hub-route-tables => hub-route-table}/README.md (100%) rename modules/network/virtual-hub/{hub-route-tables => hub-route-table}/main.bicep (100%) rename modules/network/virtual-hub/{hub-route-tables => hub-route-table}/main.json (100%) rename modules/network/virtual-hub/{hub-route-tables => hub-route-table}/version.json (100%) rename modules/network/virtual-hub/{hub-virtual-network-connections => hub-virtual-network-connection}/README.md (100%) rename modules/network/virtual-hub/{hub-virtual-network-connections => hub-virtual-network-connection}/main.bicep (100%) rename modules/network/virtual-hub/{hub-virtual-network-connections => hub-virtual-network-connection}/main.json (100%) rename modules/network/virtual-hub/{hub-virtual-network-connections => hub-virtual-network-connection}/version.json (100%) rename modules/network/virtual-network-gateway/{nat-rules => nat-rule}/README.md (100%) rename modules/network/virtual-network-gateway/{nat-rules => nat-rule}/main.bicep (100%) rename modules/network/virtual-network-gateway/{nat-rules => nat-rule}/main.json (100%) rename modules/network/virtual-network-gateway/{nat-rules => nat-rule}/version.json (100%) rename modules/network/virtual-network/{subnets => subnet}/.bicep/nested_roleAssignments.bicep (100%) rename modules/network/virtual-network/{subnets => subnet}/README.md (100%) rename modules/network/virtual-network/{subnets => subnet}/main.bicep (100%) rename modules/network/virtual-network/{subnets => subnet}/main.json (100%) rename modules/network/virtual-network/{subnets => subnet}/version.json (100%) rename modules/network/virtual-network/{virtual-network-peerings => virtual-network-peering}/README.md (100%) rename modules/network/virtual-network/{virtual-network-peerings => virtual-network-peering}/main.bicep (100%) rename modules/network/virtual-network/{virtual-network-peerings => virtual-network-peering}/main.json (100%) rename modules/network/virtual-network/{virtual-network-peerings => virtual-network-peering}/version.json (100%) rename modules/network/vpn-gateway/{nat-rules => nat-rule}/README.md (100%) rename modules/network/vpn-gateway/{nat-rules => nat-rule}/main.bicep (100%) rename modules/network/vpn-gateway/{nat-rules => nat-rule}/main.json (100%) rename modules/network/vpn-gateway/{nat-rules => nat-rule}/version.json (100%) rename modules/operational-insights/workspace/{data-exports => data-export}/README.md (100%) rename modules/operational-insights/workspace/{data-exports => data-export}/main.bicep (100%) rename modules/operational-insights/workspace/{data-exports => data-export}/main.json (100%) rename modules/operational-insights/workspace/{data-exports => data-export}/version.json (100%) rename modules/operational-insights/workspace/{data-sources => data-source}/README.md (100%) rename modules/operational-insights/workspace/{data-sources => data-source}/main.bicep (100%) rename modules/operational-insights/workspace/{data-sources => data-source}/main.json (100%) rename modules/operational-insights/workspace/{data-sources => data-source}/version.json (100%) rename modules/operational-insights/workspace/{linked-services => linked-service}/README.md (100%) rename modules/operational-insights/workspace/{linked-services => linked-service}/main.bicep (100%) rename modules/operational-insights/workspace/{linked-services => linked-service}/main.json (100%) rename modules/operational-insights/workspace/{linked-services => linked-service}/version.json (100%) rename modules/operational-insights/workspace/{linked-storage-accounts => linked-storage-account}/README.md (100%) rename modules/operational-insights/workspace/{linked-storage-accounts => linked-storage-account}/main.bicep (100%) rename modules/operational-insights/workspace/{linked-storage-accounts => linked-storage-account}/main.json (100%) rename modules/operational-insights/workspace/{linked-storage-accounts => linked-storage-account}/version.json (100%) rename modules/operational-insights/workspace/{saved-searches => saved-searche}/README.md (100%) rename modules/operational-insights/workspace/{saved-searches => saved-searche}/main.bicep (100%) rename modules/operational-insights/workspace/{saved-searches => saved-searche}/main.json (100%) rename modules/operational-insights/workspace/{saved-searches => saved-searche}/version.json (100%) rename modules/operational-insights/workspace/{storage-insight-configs => storage-insight-config}/README.md (100%) rename modules/operational-insights/workspace/{storage-insight-configs => storage-insight-config}/main.bicep (100%) rename modules/operational-insights/workspace/{storage-insight-configs => storage-insight-config}/main.json (100%) rename modules/operational-insights/workspace/{storage-insight-configs => storage-insight-config}/version.json (100%) rename modules/operational-insights/workspace/{tables => table}/README.md (100%) rename modules/operational-insights/workspace/{tables => table}/main.bicep (100%) rename modules/operational-insights/workspace/{tables => table}/main.json (100%) rename modules/operational-insights/workspace/{tables => table}/version.json (100%) rename modules/recovery-services/vault/backup-fabrics/{protection-containers => protection-container}/README.md (100%) rename modules/recovery-services/vault/backup-fabrics/{protection-containers => protection-container}/main.bicep (100%) rename modules/recovery-services/vault/backup-fabrics/{protection-containers => protection-container}/main.json (100%) rename modules/recovery-services/vault/backup-fabrics/{protection-containers => protection-container}/protected-items/README.md (100%) rename modules/recovery-services/vault/backup-fabrics/{protection-containers => protection-container}/protected-items/main.bicep (100%) rename modules/recovery-services/vault/backup-fabrics/{protection-containers => protection-container}/protected-items/main.json (100%) rename modules/recovery-services/vault/backup-fabrics/{protection-containers => protection-container}/protected-items/version.json (100%) rename modules/recovery-services/vault/backup-fabrics/{protection-containers => protection-container}/version.json (100%) rename modules/recovery-services/vault/{backup-policies => backup-policy}/README.md (100%) rename modules/recovery-services/vault/{backup-policies => backup-policy}/main.bicep (100%) rename modules/recovery-services/vault/{backup-policies => backup-policy}/main.json (100%) rename modules/recovery-services/vault/{backup-policies => backup-policy}/version.json (100%) rename modules/recovery-services/vault/{replication-alert-settings => replication-alert-setting}/README.md (100%) rename modules/recovery-services/vault/{replication-alert-settings => replication-alert-setting}/main.bicep (100%) rename modules/recovery-services/vault/{replication-alert-settings => replication-alert-setting}/main.json (100%) rename modules/recovery-services/vault/{replication-alert-settings => replication-alert-setting}/version.json (100%) rename modules/recovery-services/vault/{replication-fabrics => replication-fabric}/README.md (100%) rename modules/recovery-services/vault/{replication-fabrics => replication-fabric}/main.bicep (100%) rename modules/recovery-services/vault/{replication-fabrics => replication-fabric}/main.json (100%) rename modules/recovery-services/vault/{replication-fabrics => replication-fabric}/replication-protection-containers/README.md (100%) rename modules/recovery-services/vault/{replication-fabrics => replication-fabric}/replication-protection-containers/main.bicep (100%) rename modules/recovery-services/vault/{replication-fabrics => replication-fabric}/replication-protection-containers/main.json (100%) rename modules/recovery-services/vault/{replication-fabrics => replication-fabric}/replication-protection-containers/replication-protection-container-mappings/README.md (100%) rename modules/recovery-services/vault/{replication-fabrics => replication-fabric}/replication-protection-containers/replication-protection-container-mappings/main.bicep (100%) rename modules/recovery-services/vault/{replication-fabrics => replication-fabric}/replication-protection-containers/replication-protection-container-mappings/main.json (100%) rename modules/recovery-services/vault/{replication-fabrics => replication-fabric}/replication-protection-containers/replication-protection-container-mappings/version.json (100%) rename modules/recovery-services/vault/{replication-fabrics => replication-fabric}/replication-protection-containers/version.json (100%) rename modules/recovery-services/vault/{replication-fabrics => replication-fabric}/version.json (100%) rename modules/recovery-services/vault/{replication-policies => replication-policy}/README.md (100%) rename modules/recovery-services/vault/{replication-policies => replication-policy}/main.bicep (100%) rename modules/recovery-services/vault/{replication-policies => replication-policy}/main.json (100%) rename modules/recovery-services/vault/{replication-policies => replication-policy}/version.json (100%) rename modules/relay/namespace/{authorization-rules => authorization-rule}/README.md (100%) rename modules/relay/namespace/{authorization-rules => authorization-rule}/main.bicep (100%) rename modules/relay/namespace/{authorization-rules => authorization-rule}/main.json (100%) rename modules/relay/namespace/{authorization-rules => authorization-rule}/version.json (100%) rename modules/relay/namespace/{hybrid-connections => hybrid-connection}/.bicep/nested_roleAssignments.bicep (100%) rename modules/relay/namespace/{hybrid-connections => hybrid-connection}/README.md (100%) rename modules/relay/namespace/{hybrid-connections => hybrid-connection}/authorization-rules/README.md (100%) rename modules/relay/namespace/{hybrid-connections => hybrid-connection}/authorization-rules/main.bicep (100%) rename modules/relay/namespace/{hybrid-connections => hybrid-connection}/authorization-rules/main.json (100%) rename modules/relay/namespace/{hybrid-connections => hybrid-connection}/authorization-rules/version.json (100%) rename modules/relay/namespace/{hybrid-connections => hybrid-connection}/main.bicep (100%) rename modules/relay/namespace/{hybrid-connections => hybrid-connection}/main.json (100%) rename modules/relay/namespace/{hybrid-connections => hybrid-connection}/version.json (100%) rename modules/relay/namespace/{network-rule-sets => network-rule-set}/README.md (100%) rename modules/relay/namespace/{network-rule-sets => network-rule-set}/main.bicep (100%) rename modules/relay/namespace/{network-rule-sets => network-rule-set}/main.json (100%) rename modules/relay/namespace/{network-rule-sets => network-rule-set}/version.json (100%) rename modules/relay/namespace/{wcf-relays => wcf-relay}/.bicep/nested_roleAssignments.bicep (100%) rename modules/relay/namespace/{wcf-relays => wcf-relay}/README.md (100%) rename modules/relay/namespace/{wcf-relays => wcf-relay}/authorization-rules/README.md (100%) rename modules/relay/namespace/{wcf-relays => wcf-relay}/authorization-rules/main.bicep (100%) rename modules/relay/namespace/{wcf-relays => wcf-relay}/authorization-rules/main.json (100%) rename modules/relay/namespace/{wcf-relays => wcf-relay}/authorization-rules/version.json (100%) rename modules/relay/namespace/{wcf-relays => wcf-relay}/main.bicep (100%) rename modules/relay/namespace/{wcf-relays => wcf-relay}/main.json (100%) rename modules/relay/namespace/{wcf-relays => wcf-relay}/version.json (100%) rename modules/service-bus/namespace/{authorization-rules => authorization-rule}/README.md (100%) rename modules/service-bus/namespace/{authorization-rules => authorization-rule}/main.bicep (100%) rename modules/service-bus/namespace/{authorization-rules => authorization-rule}/main.json (100%) rename modules/service-bus/namespace/{authorization-rules => authorization-rule}/version.json (100%) rename modules/service-bus/namespace/{disaster-recovery-configs => disaster-recovery-config}/README.md (100%) rename modules/service-bus/namespace/{disaster-recovery-configs => disaster-recovery-config}/main.bicep (100%) rename modules/service-bus/namespace/{disaster-recovery-configs => disaster-recovery-config}/main.json (100%) rename modules/service-bus/namespace/{disaster-recovery-configs => disaster-recovery-config}/version.json (100%) rename modules/service-bus/namespace/{migration-configurations => migration-configuration}/README.md (100%) rename modules/service-bus/namespace/{migration-configurations => migration-configuration}/main.bicep (100%) rename modules/service-bus/namespace/{migration-configurations => migration-configuration}/main.json (100%) rename modules/service-bus/namespace/{migration-configurations => migration-configuration}/version.json (100%) rename modules/service-bus/namespace/{network-rule-sets => network-rule-set}/README.md (100%) rename modules/service-bus/namespace/{network-rule-sets => network-rule-set}/main.bicep (100%) rename modules/service-bus/namespace/{network-rule-sets => network-rule-set}/main.json (100%) rename modules/service-bus/namespace/{network-rule-sets => network-rule-set}/version.json (100%) rename modules/service-bus/namespace/{queues => queue}/.bicep/nested_roleAssignments.bicep (100%) rename modules/service-bus/namespace/{queues => queue}/README.md (100%) rename modules/service-bus/namespace/{queues => queue}/authorization-rules/README.md (100%) rename modules/service-bus/namespace/{queues => queue}/authorization-rules/main.bicep (100%) rename modules/service-bus/namespace/{queues => queue}/authorization-rules/main.json (100%) rename modules/service-bus/namespace/{queues => queue}/authorization-rules/version.json (100%) rename modules/service-bus/namespace/{queues => queue}/main.bicep (100%) rename modules/service-bus/namespace/{queues => queue}/main.json (100%) rename modules/service-bus/namespace/{queues => queue}/version.json (100%) rename modules/service-bus/namespace/{topics => topic}/.bicep/nested_roleAssignments.bicep (100%) rename modules/service-bus/namespace/{topics => topic}/README.md (100%) rename modules/service-bus/namespace/{topics => topic}/authorization-rules/README.md (100%) rename modules/service-bus/namespace/{topics => topic}/authorization-rules/main.bicep (100%) rename modules/service-bus/namespace/{topics => topic}/authorization-rules/main.json (100%) rename modules/service-bus/namespace/{topics => topic}/authorization-rules/version.json (100%) rename modules/service-bus/namespace/{topics => topic}/main.bicep (100%) rename modules/service-bus/namespace/{topics => topic}/main.json (100%) rename modules/service-bus/namespace/{topics => topic}/version.json (100%) rename modules/service-fabric/cluster/{application-types => application-type}/README.md (100%) rename modules/service-fabric/cluster/{application-types => application-type}/main.bicep (100%) rename modules/service-fabric/cluster/{application-types => application-type}/main.json (100%) rename modules/service-fabric/cluster/{application-types => application-type}/version.json (100%) rename modules/sql/managed-instance/{administrators => administrator}/README.md (100%) rename modules/sql/managed-instance/{administrators => administrator}/main.bicep (100%) rename modules/sql/managed-instance/{administrators => administrator}/main.json (100%) rename modules/sql/managed-instance/{administrators => administrator}/version.json (100%) rename modules/sql/managed-instance/{databases => database}/README.md (100%) rename modules/sql/managed-instance/{databases => database}/backup-long-term-retention-policies/README.md (100%) rename modules/sql/managed-instance/{databases => database}/backup-long-term-retention-policies/main.bicep (100%) rename modules/sql/managed-instance/{databases => database}/backup-long-term-retention-policies/main.json (100%) rename modules/sql/managed-instance/{databases => database}/backup-long-term-retention-policies/version.json (100%) rename modules/sql/managed-instance/{databases => database}/backup-short-term-retention-policies/README.md (100%) rename modules/sql/managed-instance/{databases => database}/backup-short-term-retention-policies/main.bicep (100%) rename modules/sql/managed-instance/{databases => database}/backup-short-term-retention-policies/main.json (100%) rename modules/sql/managed-instance/{databases => database}/backup-short-term-retention-policies/version.json (100%) rename modules/sql/managed-instance/{databases => database}/main.bicep (100%) rename modules/sql/managed-instance/{databases => database}/main.json (100%) rename modules/sql/managed-instance/{databases => database}/version.json (100%) rename modules/sql/managed-instance/{keys => key}/README.md (100%) rename modules/sql/managed-instance/{keys => key}/main.bicep (100%) rename modules/sql/managed-instance/{keys => key}/main.json (100%) rename modules/sql/managed-instance/{keys => key}/version.json (100%) rename modules/sql/managed-instance/{security-alert-policies => security-alert-policy}/README.md (100%) rename modules/sql/managed-instance/{security-alert-policies => security-alert-policy}/main.bicep (100%) rename modules/sql/managed-instance/{security-alert-policies => security-alert-policy}/main.json (100%) rename modules/sql/managed-instance/{security-alert-policies => security-alert-policy}/version.json (100%) rename modules/sql/managed-instance/{vulnerability-assessments => vulnerability-assessment}/README.md (100%) rename modules/sql/managed-instance/{vulnerability-assessments => vulnerability-assessment}/main.bicep (100%) rename modules/sql/managed-instance/{vulnerability-assessments => vulnerability-assessment}/main.json (100%) rename modules/sql/managed-instance/{vulnerability-assessments => vulnerability-assessment}/version.json (100%) rename modules/sql/server/{databases => database}/README.md (100%) rename modules/sql/server/{databases => database}/backup-long-term-retention-policies/README.md (100%) rename modules/sql/server/{databases => database}/backup-long-term-retention-policies/main.bicep (100%) rename modules/sql/server/{databases => database}/backup-long-term-retention-policies/main.json (100%) rename modules/sql/server/{databases => database}/backup-long-term-retention-policies/version.json (100%) rename modules/sql/server/{databases => database}/backup-short-term-retention-policies/README.md (100%) rename modules/sql/server/{databases => database}/backup-short-term-retention-policies/main.bicep (100%) rename modules/sql/server/{databases => database}/backup-short-term-retention-policies/main.json (100%) rename modules/sql/server/{databases => database}/backup-short-term-retention-policies/version.json (100%) rename modules/sql/server/{databases => database}/main.bicep (100%) rename modules/sql/server/{databases => database}/main.json (100%) rename modules/sql/server/{databases => database}/version.json (100%) rename modules/sql/server/{elastic-pools => elastic-pool}/README.md (100%) rename modules/sql/server/{elastic-pools => elastic-pool}/main.bicep (100%) rename modules/sql/server/{elastic-pools => elastic-pool}/main.json (100%) rename modules/sql/server/{elastic-pools => elastic-pool}/version.json (100%) rename modules/sql/server/{firewall-rules => firewall-rule}/README.md (100%) rename modules/sql/server/{firewall-rules => firewall-rule}/main.bicep (100%) rename modules/sql/server/{firewall-rules => firewall-rule}/main.json (100%) rename modules/sql/server/{firewall-rules => firewall-rule}/version.json (100%) rename modules/sql/server/{keys => key}/README.md (100%) rename modules/sql/server/{keys => key}/main.bicep (100%) rename modules/sql/server/{keys => key}/main.json (100%) rename modules/sql/server/{keys => key}/version.json (100%) rename modules/sql/server/{security-alert-policies => security-alert-policy}/README.md (100%) rename modules/sql/server/{security-alert-policies => security-alert-policy}/main.bicep (100%) rename modules/sql/server/{security-alert-policies => security-alert-policy}/main.json (100%) rename modules/sql/server/{security-alert-policies => security-alert-policy}/version.json (100%) rename modules/sql/server/{virtual-network-rules => virtual-network-rule}/README.md (100%) rename modules/sql/server/{virtual-network-rules => virtual-network-rule}/main.bicep (100%) rename modules/sql/server/{virtual-network-rules => virtual-network-rule}/main.json (100%) rename modules/sql/server/{virtual-network-rules => virtual-network-rule}/version.json (100%) rename modules/sql/server/{vulnerability-assessments => vulnerability-assessment}/README.md (100%) rename modules/sql/server/{vulnerability-assessments => vulnerability-assessment}/main.bicep (100%) rename modules/sql/server/{vulnerability-assessments => vulnerability-assessment}/main.json (100%) rename modules/sql/server/{vulnerability-assessments => vulnerability-assessment}/version.json (100%) rename modules/storage/storage-account/{blob-services => blob-service}/README.md (100%) rename modules/storage/storage-account/{blob-services => blob-service}/containers/.bicep/nested_roleAssignments.bicep (100%) rename modules/storage/storage-account/{blob-services => blob-service}/containers/README.md (100%) rename modules/storage/storage-account/{blob-services => blob-service}/containers/immutability-policies/README.md (100%) rename modules/storage/storage-account/{blob-services => blob-service}/containers/immutability-policies/main.bicep (100%) rename modules/storage/storage-account/{blob-services => blob-service}/containers/immutability-policies/main.json (100%) rename modules/storage/storage-account/{blob-services => blob-service}/containers/immutability-policies/version.json (100%) rename modules/storage/storage-account/{blob-services => blob-service}/containers/main.bicep (100%) rename modules/storage/storage-account/{blob-services => blob-service}/containers/main.json (100%) rename modules/storage/storage-account/{blob-services => blob-service}/containers/version.json (100%) rename modules/storage/storage-account/{blob-services => blob-service}/main.bicep (100%) rename modules/storage/storage-account/{blob-services => blob-service}/main.json (100%) rename modules/storage/storage-account/{blob-services => blob-service}/version.json (100%) rename modules/storage/storage-account/{file-services => file-service}/README.md (100%) rename modules/storage/storage-account/{file-services => file-service}/main.bicep (100%) rename modules/storage/storage-account/{file-services => file-service}/main.json (100%) rename modules/storage/storage-account/{file-services => file-service}/shares/.bicep/nested_roleAssignments.bicep (100%) rename modules/storage/storage-account/{file-services => file-service}/shares/README.md (100%) rename modules/storage/storage-account/{file-services => file-service}/shares/main.bicep (100%) rename modules/storage/storage-account/{file-services => file-service}/shares/main.json (100%) rename modules/storage/storage-account/{file-services => file-service}/shares/version.json (100%) rename modules/storage/storage-account/{file-services => file-service}/version.json (100%) rename modules/storage/storage-account/{local-users => local-user}/README.md (100%) rename modules/storage/storage-account/{local-users => local-user}/main.bicep (100%) rename modules/storage/storage-account/{local-users => local-user}/main.json (100%) rename modules/storage/storage-account/{local-users => local-user}/version.json (100%) rename modules/storage/storage-account/{management-policies => management-policy}/README.md (100%) rename modules/storage/storage-account/{management-policies => management-policy}/main.bicep (100%) rename modules/storage/storage-account/{management-policies => management-policy}/main.json (100%) rename modules/storage/storage-account/{management-policies => management-policy}/version.json (100%) rename modules/storage/storage-account/{queue-services => queue-service}/README.md (100%) rename modules/storage/storage-account/{queue-services => queue-service}/main.bicep (100%) rename modules/storage/storage-account/{queue-services => queue-service}/main.json (100%) rename modules/storage/storage-account/{queue-services => queue-service}/queues/.bicep/nested_roleAssignments.bicep (100%) rename modules/storage/storage-account/{queue-services => queue-service}/queues/README.md (100%) rename modules/storage/storage-account/{queue-services => queue-service}/queues/main.bicep (100%) rename modules/storage/storage-account/{queue-services => queue-service}/queues/main.json (100%) rename modules/storage/storage-account/{queue-services => queue-service}/queues/version.json (100%) rename modules/storage/storage-account/{queue-services => queue-service}/version.json (100%) rename modules/storage/storage-account/{table-services => table-service}/README.md (100%) rename modules/storage/storage-account/{table-services => table-service}/main.bicep (100%) rename modules/storage/storage-account/{table-services => table-service}/main.json (100%) rename modules/storage/storage-account/{table-services => table-service}/tables/README.md (100%) rename modules/storage/storage-account/{table-services => table-service}/tables/main.bicep (100%) rename modules/storage/storage-account/{table-services => table-service}/tables/main.json (100%) rename modules/storage/storage-account/{table-services => table-service}/tables/version.json (100%) rename modules/storage/storage-account/{table-services => table-service}/version.json (100%) rename modules/synapse/workspace/{integration-runtimes => integration-runtime}/README.md (100%) rename modules/synapse/workspace/{integration-runtimes => integration-runtime}/main.bicep (100%) rename modules/synapse/workspace/{integration-runtimes => integration-runtime}/main.json (100%) rename modules/synapse/workspace/{integration-runtimes => integration-runtime}/version.json (100%) rename modules/synapse/workspace/{keys => key}/README.md (100%) rename modules/synapse/workspace/{keys => key}/main.bicep (100%) rename modules/synapse/workspace/{keys => key}/main.json (100%) rename modules/synapse/workspace/{keys => key}/version.json (100%) rename modules/web/site/{basic-publishing-credentials-policies => basic-publishing-credentials-policy}/README.md (100%) rename modules/web/site/{basic-publishing-credentials-policies => basic-publishing-credentials-policy}/main.bicep (100%) rename modules/web/site/{basic-publishing-credentials-policies => basic-publishing-credentials-policy}/main.json (100%) rename modules/web/site/{basic-publishing-credentials-policies => basic-publishing-credentials-policy}/version.json (100%) rename modules/web/site/{config--appsettings => config--appsetting}/README.md (100%) rename modules/web/site/{config--appsettings => config--appsetting}/main.bicep (100%) rename modules/web/site/{config--appsettings => config--appsetting}/main.json (100%) rename modules/web/site/{config--appsettings => config--appsetting}/version.json (100%) rename modules/web/site/{hybrid-connection-namespaces => hybrid-connection-namespace}/relays/README.md (100%) rename modules/web/site/{hybrid-connection-namespaces => hybrid-connection-namespace}/relays/main.bicep (100%) rename modules/web/site/{hybrid-connection-namespaces => hybrid-connection-namespace}/relays/main.json (100%) rename modules/web/site/{hybrid-connection-namespaces => hybrid-connection-namespace}/relays/version.json (100%) rename modules/web/site/{slots => slot}/.bicep/nested_roleAssignments.bicep (100%) rename modules/web/site/{slots => slot}/README.md (100%) rename modules/web/site/{slots => slot}/config--appsettings/README.md (100%) rename modules/web/site/{slots => slot}/config--appsettings/main.bicep (100%) rename modules/web/site/{slots => slot}/config--appsettings/main.json (100%) rename modules/web/site/{slots => slot}/config--appsettings/version.json (100%) rename modules/web/site/{slots => slot}/config--authsettingsv2/README.md (100%) rename modules/web/site/{slots => slot}/config--authsettingsv2/main.bicep (100%) rename modules/web/site/{slots => slot}/config--authsettingsv2/main.json (100%) rename modules/web/site/{slots => slot}/config--authsettingsv2/version.json (100%) rename modules/web/site/{slots => slot}/hybrid-connection-namespaces/relays/README.md (100%) rename modules/web/site/{slots => slot}/hybrid-connection-namespaces/relays/main.bicep (100%) rename modules/web/site/{slots => slot}/hybrid-connection-namespaces/relays/main.json (100%) rename modules/web/site/{slots => slot}/hybrid-connection-namespaces/relays/version.json (100%) rename modules/web/site/{slots => slot}/main.bicep (100%) rename modules/web/site/{slots => slot}/main.json (100%) rename modules/web/site/{slots => slot}/version.json (100%) rename modules/web/static-site/{custom-domains => custom-domain}/README.md (100%) rename modules/web/static-site/{custom-domains => custom-domain}/main.bicep (100%) rename modules/web/static-site/{custom-domains => custom-domain}/main.json (100%) rename modules/web/static-site/{custom-domains => custom-domain}/version.json (100%) rename modules/web/static-site/{linked-backends => linked-backend}/README.md (100%) rename modules/web/static-site/{linked-backends => linked-backend}/main.bicep (100%) rename modules/web/static-site/{linked-backends => linked-backend}/main.json (100%) rename modules/web/static-site/{linked-backends => linked-backend}/version.json (100%) diff --git a/modules/api-management/service/api/policies/README.md b/modules/api-management/service/api/policy/README.md similarity index 100% rename from modules/api-management/service/api/policies/README.md rename to modules/api-management/service/api/policy/README.md diff --git a/modules/api-management/service/api/policies/main.bicep b/modules/api-management/service/api/policy/main.bicep similarity index 100% rename from modules/api-management/service/api/policies/main.bicep rename to modules/api-management/service/api/policy/main.bicep diff --git a/modules/api-management/service/api/policies/main.json b/modules/api-management/service/api/policy/main.json similarity index 100% rename from modules/api-management/service/api/policies/main.json rename to modules/api-management/service/api/policy/main.json diff --git a/modules/api-management/service/api/policies/version.json b/modules/api-management/service/api/policy/version.json similarity index 100% rename from modules/api-management/service/api/policies/version.json rename to modules/api-management/service/api/policy/version.json diff --git a/modules/api-management/service/product/apis/README.md b/modules/api-management/service/product/api/README.md similarity index 100% rename from modules/api-management/service/product/apis/README.md rename to modules/api-management/service/product/api/README.md diff --git a/modules/api-management/service/product/apis/main.bicep b/modules/api-management/service/product/api/main.bicep similarity index 100% rename from modules/api-management/service/product/apis/main.bicep rename to modules/api-management/service/product/api/main.bicep diff --git a/modules/api-management/service/product/apis/main.json b/modules/api-management/service/product/api/main.json similarity index 100% rename from modules/api-management/service/product/apis/main.json rename to modules/api-management/service/product/api/main.json diff --git a/modules/api-management/service/product/apis/version.json b/modules/api-management/service/product/api/version.json similarity index 100% rename from modules/api-management/service/product/apis/version.json rename to modules/api-management/service/product/api/version.json diff --git a/modules/api-management/service/product/groups/README.md b/modules/api-management/service/product/group/README.md similarity index 100% rename from modules/api-management/service/product/groups/README.md rename to modules/api-management/service/product/group/README.md diff --git a/modules/api-management/service/product/groups/main.bicep b/modules/api-management/service/product/group/main.bicep similarity index 100% rename from modules/api-management/service/product/groups/main.bicep rename to modules/api-management/service/product/group/main.bicep diff --git a/modules/api-management/service/product/groups/main.json b/modules/api-management/service/product/group/main.json similarity index 100% rename from modules/api-management/service/product/groups/main.json rename to modules/api-management/service/product/group/main.json diff --git a/modules/api-management/service/product/groups/version.json b/modules/api-management/service/product/group/version.json similarity index 100% rename from modules/api-management/service/product/groups/version.json rename to modules/api-management/service/product/group/version.json diff --git a/modules/app-configuration/configuration-store/key-values/.bicep/nested_roleAssignments.bicep b/modules/app-configuration/configuration-store/key-value/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/app-configuration/configuration-store/key-values/.bicep/nested_roleAssignments.bicep rename to modules/app-configuration/configuration-store/key-value/.bicep/nested_roleAssignments.bicep diff --git a/modules/app-configuration/configuration-store/key-values/README.md b/modules/app-configuration/configuration-store/key-value/README.md similarity index 100% rename from modules/app-configuration/configuration-store/key-values/README.md rename to modules/app-configuration/configuration-store/key-value/README.md diff --git a/modules/app-configuration/configuration-store/key-values/main.bicep b/modules/app-configuration/configuration-store/key-value/main.bicep similarity index 100% rename from modules/app-configuration/configuration-store/key-values/main.bicep rename to modules/app-configuration/configuration-store/key-value/main.bicep diff --git a/modules/app-configuration/configuration-store/key-values/main.json b/modules/app-configuration/configuration-store/key-value/main.json similarity index 100% rename from modules/app-configuration/configuration-store/key-values/main.json rename to modules/app-configuration/configuration-store/key-value/main.json diff --git a/modules/app-configuration/configuration-store/key-values/version.json b/modules/app-configuration/configuration-store/key-value/version.json similarity index 100% rename from modules/app-configuration/configuration-store/key-values/version.json rename to modules/app-configuration/configuration-store/key-value/version.json diff --git a/modules/automation/automation-account/job-schedules/README.md b/modules/automation/automation-account/job-schedule/README.md similarity index 100% rename from modules/automation/automation-account/job-schedules/README.md rename to modules/automation/automation-account/job-schedule/README.md diff --git a/modules/automation/automation-account/job-schedules/main.bicep b/modules/automation/automation-account/job-schedule/main.bicep similarity index 100% rename from modules/automation/automation-account/job-schedules/main.bicep rename to modules/automation/automation-account/job-schedule/main.bicep diff --git a/modules/automation/automation-account/job-schedules/main.json b/modules/automation/automation-account/job-schedule/main.json similarity index 100% rename from modules/automation/automation-account/job-schedules/main.json rename to modules/automation/automation-account/job-schedule/main.json diff --git a/modules/automation/automation-account/job-schedules/version.json b/modules/automation/automation-account/job-schedule/version.json similarity index 100% rename from modules/automation/automation-account/job-schedules/version.json rename to modules/automation/automation-account/job-schedule/version.json diff --git a/modules/automation/automation-account/modules/README.md b/modules/automation/automation-account/module/README.md similarity index 100% rename from modules/automation/automation-account/modules/README.md rename to modules/automation/automation-account/module/README.md diff --git a/modules/automation/automation-account/modules/main.bicep b/modules/automation/automation-account/module/main.bicep similarity index 100% rename from modules/automation/automation-account/modules/main.bicep rename to modules/automation/automation-account/module/main.bicep diff --git a/modules/automation/automation-account/modules/main.json b/modules/automation/automation-account/module/main.json similarity index 100% rename from modules/automation/automation-account/modules/main.json rename to modules/automation/automation-account/module/main.json diff --git a/modules/automation/automation-account/modules/version.json b/modules/automation/automation-account/module/version.json similarity index 100% rename from modules/automation/automation-account/modules/version.json rename to modules/automation/automation-account/module/version.json diff --git a/modules/automation/automation-account/runbooks/README.md b/modules/automation/automation-account/runbook/README.md similarity index 100% rename from modules/automation/automation-account/runbooks/README.md rename to modules/automation/automation-account/runbook/README.md diff --git a/modules/automation/automation-account/runbooks/main.bicep b/modules/automation/automation-account/runbook/main.bicep similarity index 100% rename from modules/automation/automation-account/runbooks/main.bicep rename to modules/automation/automation-account/runbook/main.bicep diff --git a/modules/automation/automation-account/runbooks/main.json b/modules/automation/automation-account/runbook/main.json similarity index 100% rename from modules/automation/automation-account/runbooks/main.json rename to modules/automation/automation-account/runbook/main.json diff --git a/modules/automation/automation-account/runbooks/version.json b/modules/automation/automation-account/runbook/version.json similarity index 100% rename from modules/automation/automation-account/runbooks/version.json rename to modules/automation/automation-account/runbook/version.json diff --git a/modules/automation/automation-account/schedules/README.md b/modules/automation/automation-account/schedule/README.md similarity index 100% rename from modules/automation/automation-account/schedules/README.md rename to modules/automation/automation-account/schedule/README.md diff --git a/modules/automation/automation-account/schedules/main.bicep b/modules/automation/automation-account/schedule/main.bicep similarity index 100% rename from modules/automation/automation-account/schedules/main.bicep rename to modules/automation/automation-account/schedule/main.bicep diff --git a/modules/automation/automation-account/schedules/main.json b/modules/automation/automation-account/schedule/main.json similarity index 100% rename from modules/automation/automation-account/schedules/main.json rename to modules/automation/automation-account/schedule/main.json diff --git a/modules/automation/automation-account/schedules/version.json b/modules/automation/automation-account/schedule/version.json similarity index 100% rename from modules/automation/automation-account/schedules/version.json rename to modules/automation/automation-account/schedule/version.json diff --git a/modules/automation/automation-account/software-update-configurations/README.md b/modules/automation/automation-account/software-update-configuration/README.md similarity index 100% rename from modules/automation/automation-account/software-update-configurations/README.md rename to modules/automation/automation-account/software-update-configuration/README.md diff --git a/modules/automation/automation-account/software-update-configurations/main.bicep b/modules/automation/automation-account/software-update-configuration/main.bicep similarity index 100% rename from modules/automation/automation-account/software-update-configurations/main.bicep rename to modules/automation/automation-account/software-update-configuration/main.bicep diff --git a/modules/automation/automation-account/software-update-configurations/main.json b/modules/automation/automation-account/software-update-configuration/main.json similarity index 100% rename from modules/automation/automation-account/software-update-configurations/main.json rename to modules/automation/automation-account/software-update-configuration/main.json diff --git a/modules/automation/automation-account/software-update-configurations/version.json b/modules/automation/automation-account/software-update-configuration/version.json similarity index 100% rename from modules/automation/automation-account/software-update-configurations/version.json rename to modules/automation/automation-account/software-update-configuration/version.json diff --git a/modules/automation/automation-account/variables/README.md b/modules/automation/automation-account/variable/README.md similarity index 100% rename from modules/automation/automation-account/variables/README.md rename to modules/automation/automation-account/variable/README.md diff --git a/modules/automation/automation-account/variables/main.bicep b/modules/automation/automation-account/variable/main.bicep similarity index 100% rename from modules/automation/automation-account/variables/main.bicep rename to modules/automation/automation-account/variable/main.bicep diff --git a/modules/automation/automation-account/variables/main.json b/modules/automation/automation-account/variable/main.json similarity index 100% rename from modules/automation/automation-account/variables/main.json rename to modules/automation/automation-account/variable/main.json diff --git a/modules/automation/automation-account/variables/version.json b/modules/automation/automation-account/variable/version.json similarity index 100% rename from modules/automation/automation-account/variables/version.json rename to modules/automation/automation-account/variable/version.json diff --git a/modules/cdn/profiles/endpoint/origins/README.md b/modules/cdn/profiles/endpoint/origin/README.md similarity index 100% rename from modules/cdn/profiles/endpoint/origins/README.md rename to modules/cdn/profiles/endpoint/origin/README.md diff --git a/modules/cdn/profiles/endpoint/origins/main.bicep b/modules/cdn/profiles/endpoint/origin/main.bicep similarity index 100% rename from modules/cdn/profiles/endpoint/origins/main.bicep rename to modules/cdn/profiles/endpoint/origin/main.bicep diff --git a/modules/cdn/profiles/endpoint/origins/main.json b/modules/cdn/profiles/endpoint/origin/main.json similarity index 100% rename from modules/cdn/profiles/endpoint/origins/main.json rename to modules/cdn/profiles/endpoint/origin/main.json diff --git a/modules/cdn/profiles/endpoint/origins/version.json b/modules/cdn/profiles/endpoint/origin/version.json similarity index 100% rename from modules/cdn/profiles/endpoint/origins/version.json rename to modules/cdn/profiles/endpoint/origin/version.json diff --git a/modules/compute/gallery/applications/.bicep/nested_roleAssignments.bicep b/modules/compute/gallery/application/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/compute/gallery/applications/.bicep/nested_roleAssignments.bicep rename to modules/compute/gallery/application/.bicep/nested_roleAssignments.bicep diff --git a/modules/compute/gallery/applications/README.md b/modules/compute/gallery/application/README.md similarity index 100% rename from modules/compute/gallery/applications/README.md rename to modules/compute/gallery/application/README.md diff --git a/modules/compute/gallery/applications/main.bicep b/modules/compute/gallery/application/main.bicep similarity index 100% rename from modules/compute/gallery/applications/main.bicep rename to modules/compute/gallery/application/main.bicep diff --git a/modules/compute/gallery/applications/main.json b/modules/compute/gallery/application/main.json similarity index 100% rename from modules/compute/gallery/applications/main.json rename to modules/compute/gallery/application/main.json diff --git a/modules/compute/gallery/applications/version.json b/modules/compute/gallery/application/version.json similarity index 100% rename from modules/compute/gallery/applications/version.json rename to modules/compute/gallery/application/version.json diff --git a/modules/compute/gallery/images/.bicep/nested_roleAssignments.bicep b/modules/compute/gallery/image/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/compute/gallery/images/.bicep/nested_roleAssignments.bicep rename to modules/compute/gallery/image/.bicep/nested_roleAssignments.bicep diff --git a/modules/compute/gallery/images/README.md b/modules/compute/gallery/image/README.md similarity index 100% rename from modules/compute/gallery/images/README.md rename to modules/compute/gallery/image/README.md diff --git a/modules/compute/gallery/images/main.bicep b/modules/compute/gallery/image/main.bicep similarity index 100% rename from modules/compute/gallery/images/main.bicep rename to modules/compute/gallery/image/main.bicep diff --git a/modules/compute/gallery/images/main.json b/modules/compute/gallery/image/main.json similarity index 100% rename from modules/compute/gallery/images/main.json rename to modules/compute/gallery/image/main.json diff --git a/modules/compute/gallery/images/version.json b/modules/compute/gallery/image/version.json similarity index 100% rename from modules/compute/gallery/images/version.json rename to modules/compute/gallery/image/version.json diff --git a/modules/compute/virtual-machine-scale-set/extensions/README.md b/modules/compute/virtual-machine-scale-set/extension/README.md similarity index 100% rename from modules/compute/virtual-machine-scale-set/extensions/README.md rename to modules/compute/virtual-machine-scale-set/extension/README.md diff --git a/modules/compute/virtual-machine-scale-set/extensions/main.bicep b/modules/compute/virtual-machine-scale-set/extension/main.bicep similarity index 100% rename from modules/compute/virtual-machine-scale-set/extensions/main.bicep rename to modules/compute/virtual-machine-scale-set/extension/main.bicep diff --git a/modules/compute/virtual-machine-scale-set/extensions/main.json b/modules/compute/virtual-machine-scale-set/extension/main.json similarity index 100% rename from modules/compute/virtual-machine-scale-set/extensions/main.json rename to modules/compute/virtual-machine-scale-set/extension/main.json diff --git a/modules/compute/virtual-machine-scale-set/extensions/version.json b/modules/compute/virtual-machine-scale-set/extension/version.json similarity index 100% rename from modules/compute/virtual-machine-scale-set/extensions/version.json rename to modules/compute/virtual-machine-scale-set/extension/version.json diff --git a/modules/compute/virtual-machine/extensions/README.md b/modules/compute/virtual-machine/extension/README.md similarity index 100% rename from modules/compute/virtual-machine/extensions/README.md rename to modules/compute/virtual-machine/extension/README.md diff --git a/modules/compute/virtual-machine/extensions/main.bicep b/modules/compute/virtual-machine/extension/main.bicep similarity index 100% rename from modules/compute/virtual-machine/extensions/main.bicep rename to modules/compute/virtual-machine/extension/main.bicep diff --git a/modules/compute/virtual-machine/extensions/main.json b/modules/compute/virtual-machine/extension/main.json similarity index 100% rename from modules/compute/virtual-machine/extensions/main.json rename to modules/compute/virtual-machine/extension/main.json diff --git a/modules/compute/virtual-machine/extensions/version.json b/modules/compute/virtual-machine/extension/version.json similarity index 100% rename from modules/compute/virtual-machine/extensions/version.json rename to modules/compute/virtual-machine/extension/version.json diff --git a/modules/container-registry/registry/replications/README.md b/modules/container-registry/registry/replication/README.md similarity index 100% rename from modules/container-registry/registry/replications/README.md rename to modules/container-registry/registry/replication/README.md diff --git a/modules/container-registry/registry/replications/main.bicep b/modules/container-registry/registry/replication/main.bicep similarity index 100% rename from modules/container-registry/registry/replications/main.bicep rename to modules/container-registry/registry/replication/main.bicep diff --git a/modules/container-registry/registry/replications/main.json b/modules/container-registry/registry/replication/main.json similarity index 100% rename from modules/container-registry/registry/replications/main.json rename to modules/container-registry/registry/replication/main.json diff --git a/modules/container-registry/registry/replications/version.json b/modules/container-registry/registry/replication/version.json similarity index 100% rename from modules/container-registry/registry/replications/version.json rename to modules/container-registry/registry/replication/version.json diff --git a/modules/container-registry/registry/webhooks/README.md b/modules/container-registry/registry/webhook/README.md similarity index 100% rename from modules/container-registry/registry/webhooks/README.md rename to modules/container-registry/registry/webhook/README.md diff --git a/modules/container-registry/registry/webhooks/main.bicep b/modules/container-registry/registry/webhook/main.bicep similarity index 100% rename from modules/container-registry/registry/webhooks/main.bicep rename to modules/container-registry/registry/webhook/main.bicep diff --git a/modules/container-registry/registry/webhooks/main.json b/modules/container-registry/registry/webhook/main.json similarity index 100% rename from modules/container-registry/registry/webhooks/main.json rename to modules/container-registry/registry/webhook/main.json diff --git a/modules/container-registry/registry/webhooks/version.json b/modules/container-registry/registry/webhook/version.json similarity index 100% rename from modules/container-registry/registry/webhooks/version.json rename to modules/container-registry/registry/webhook/version.json diff --git a/modules/container-service/managed-cluster/agent-pools/README.md b/modules/container-service/managed-cluster/agent-pool/README.md similarity index 100% rename from modules/container-service/managed-cluster/agent-pools/README.md rename to modules/container-service/managed-cluster/agent-pool/README.md diff --git a/modules/container-service/managed-cluster/agent-pools/main.bicep b/modules/container-service/managed-cluster/agent-pool/main.bicep similarity index 100% rename from modules/container-service/managed-cluster/agent-pools/main.bicep rename to modules/container-service/managed-cluster/agent-pool/main.bicep diff --git a/modules/container-service/managed-cluster/agent-pools/main.json b/modules/container-service/managed-cluster/agent-pool/main.json similarity index 100% rename from modules/container-service/managed-cluster/agent-pools/main.json rename to modules/container-service/managed-cluster/agent-pool/main.json diff --git a/modules/container-service/managed-cluster/agent-pools/version.json b/modules/container-service/managed-cluster/agent-pool/version.json similarity index 100% rename from modules/container-service/managed-cluster/agent-pools/version.json rename to modules/container-service/managed-cluster/agent-pool/version.json diff --git a/modules/data-factory/factories/managed-virtual-network/managed-private-endpoints/README.md b/modules/data-factory/factories/managed-virtual-network/managed-private-endpoint/README.md similarity index 100% rename from modules/data-factory/factories/managed-virtual-network/managed-private-endpoints/README.md rename to modules/data-factory/factories/managed-virtual-network/managed-private-endpoint/README.md diff --git a/modules/data-factory/factories/managed-virtual-network/managed-private-endpoints/main.bicep b/modules/data-factory/factories/managed-virtual-network/managed-private-endpoint/main.bicep similarity index 100% rename from modules/data-factory/factories/managed-virtual-network/managed-private-endpoints/main.bicep rename to modules/data-factory/factories/managed-virtual-network/managed-private-endpoint/main.bicep diff --git a/modules/data-factory/factories/managed-virtual-network/managed-private-endpoints/main.json b/modules/data-factory/factories/managed-virtual-network/managed-private-endpoint/main.json similarity index 100% rename from modules/data-factory/factories/managed-virtual-network/managed-private-endpoints/main.json rename to modules/data-factory/factories/managed-virtual-network/managed-private-endpoint/main.json diff --git a/modules/data-factory/factories/managed-virtual-network/managed-private-endpoints/version.json b/modules/data-factory/factories/managed-virtual-network/managed-private-endpoint/version.json similarity index 100% rename from modules/data-factory/factories/managed-virtual-network/managed-private-endpoints/version.json rename to modules/data-factory/factories/managed-virtual-network/managed-private-endpoint/version.json diff --git a/modules/data-protection/backup-vault/backup-policies/README.md b/modules/data-protection/backup-vault/backup-policy/README.md similarity index 100% rename from modules/data-protection/backup-vault/backup-policies/README.md rename to modules/data-protection/backup-vault/backup-policy/README.md diff --git a/modules/data-protection/backup-vault/backup-policies/main.bicep b/modules/data-protection/backup-vault/backup-policy/main.bicep similarity index 100% rename from modules/data-protection/backup-vault/backup-policies/main.bicep rename to modules/data-protection/backup-vault/backup-policy/main.bicep diff --git a/modules/data-protection/backup-vault/backup-policies/main.json b/modules/data-protection/backup-vault/backup-policy/main.json similarity index 100% rename from modules/data-protection/backup-vault/backup-policies/main.json rename to modules/data-protection/backup-vault/backup-policy/main.json diff --git a/modules/data-protection/backup-vault/backup-policies/version.json b/modules/data-protection/backup-vault/backup-policy/version.json similarity index 100% rename from modules/data-protection/backup-vault/backup-policies/version.json rename to modules/data-protection/backup-vault/backup-policy/version.json diff --git a/modules/db-for-my-sql/flexible-server/databases/README.md b/modules/db-for-my-sql/flexible-server/database/README.md similarity index 100% rename from modules/db-for-my-sql/flexible-server/databases/README.md rename to modules/db-for-my-sql/flexible-server/database/README.md diff --git a/modules/db-for-my-sql/flexible-server/databases/main.bicep b/modules/db-for-my-sql/flexible-server/database/main.bicep similarity index 100% rename from modules/db-for-my-sql/flexible-server/databases/main.bicep rename to modules/db-for-my-sql/flexible-server/database/main.bicep diff --git a/modules/db-for-my-sql/flexible-server/databases/main.json b/modules/db-for-my-sql/flexible-server/database/main.json similarity index 100% rename from modules/db-for-my-sql/flexible-server/databases/main.json rename to modules/db-for-my-sql/flexible-server/database/main.json diff --git a/modules/db-for-my-sql/flexible-server/databases/version.json b/modules/db-for-my-sql/flexible-server/database/version.json similarity index 100% rename from modules/db-for-my-sql/flexible-server/databases/version.json rename to modules/db-for-my-sql/flexible-server/database/version.json diff --git a/modules/db-for-my-sql/flexible-server/firewall-rules/README.md b/modules/db-for-my-sql/flexible-server/firewall-rule/README.md similarity index 100% rename from modules/db-for-my-sql/flexible-server/firewall-rules/README.md rename to modules/db-for-my-sql/flexible-server/firewall-rule/README.md diff --git a/modules/db-for-my-sql/flexible-server/firewall-rules/main.bicep b/modules/db-for-my-sql/flexible-server/firewall-rule/main.bicep similarity index 100% rename from modules/db-for-my-sql/flexible-server/firewall-rules/main.bicep rename to modules/db-for-my-sql/flexible-server/firewall-rule/main.bicep diff --git a/modules/db-for-my-sql/flexible-server/firewall-rules/main.json b/modules/db-for-my-sql/flexible-server/firewall-rule/main.json similarity index 100% rename from modules/db-for-my-sql/flexible-server/firewall-rules/main.json rename to modules/db-for-my-sql/flexible-server/firewall-rule/main.json diff --git a/modules/db-for-my-sql/flexible-server/firewall-rules/version.json b/modules/db-for-my-sql/flexible-server/firewall-rule/version.json similarity index 100% rename from modules/db-for-my-sql/flexible-server/firewall-rules/version.json rename to modules/db-for-my-sql/flexible-server/firewall-rule/version.json diff --git a/modules/db-for-postgre-sql/flexible-server/configurations/README.md b/modules/db-for-postgre-sql/flexible-server/configuration/README.md similarity index 100% rename from modules/db-for-postgre-sql/flexible-server/configurations/README.md rename to modules/db-for-postgre-sql/flexible-server/configuration/README.md diff --git a/modules/db-for-postgre-sql/flexible-server/configurations/main.bicep b/modules/db-for-postgre-sql/flexible-server/configuration/main.bicep similarity index 100% rename from modules/db-for-postgre-sql/flexible-server/configurations/main.bicep rename to modules/db-for-postgre-sql/flexible-server/configuration/main.bicep diff --git a/modules/db-for-postgre-sql/flexible-server/configurations/main.json b/modules/db-for-postgre-sql/flexible-server/configuration/main.json similarity index 100% rename from modules/db-for-postgre-sql/flexible-server/configurations/main.json rename to modules/db-for-postgre-sql/flexible-server/configuration/main.json diff --git a/modules/db-for-postgre-sql/flexible-server/configurations/version.json b/modules/db-for-postgre-sql/flexible-server/configuration/version.json similarity index 100% rename from modules/db-for-postgre-sql/flexible-server/configurations/version.json rename to modules/db-for-postgre-sql/flexible-server/configuration/version.json diff --git a/modules/db-for-postgre-sql/flexible-server/databases/README.md b/modules/db-for-postgre-sql/flexible-server/database/README.md similarity index 100% rename from modules/db-for-postgre-sql/flexible-server/databases/README.md rename to modules/db-for-postgre-sql/flexible-server/database/README.md diff --git a/modules/db-for-postgre-sql/flexible-server/databases/main.bicep b/modules/db-for-postgre-sql/flexible-server/database/main.bicep similarity index 100% rename from modules/db-for-postgre-sql/flexible-server/databases/main.bicep rename to modules/db-for-postgre-sql/flexible-server/database/main.bicep diff --git a/modules/db-for-postgre-sql/flexible-server/databases/main.json b/modules/db-for-postgre-sql/flexible-server/database/main.json similarity index 100% rename from modules/db-for-postgre-sql/flexible-server/databases/main.json rename to modules/db-for-postgre-sql/flexible-server/database/main.json diff --git a/modules/db-for-postgre-sql/flexible-server/databases/version.json b/modules/db-for-postgre-sql/flexible-server/database/version.json similarity index 100% rename from modules/db-for-postgre-sql/flexible-server/databases/version.json rename to modules/db-for-postgre-sql/flexible-server/database/version.json diff --git a/modules/db-for-postgre-sql/flexible-server/firewall-rules/README.md b/modules/db-for-postgre-sql/flexible-server/firewall-rule/README.md similarity index 100% rename from modules/db-for-postgre-sql/flexible-server/firewall-rules/README.md rename to modules/db-for-postgre-sql/flexible-server/firewall-rule/README.md diff --git a/modules/db-for-postgre-sql/flexible-server/firewall-rules/main.bicep b/modules/db-for-postgre-sql/flexible-server/firewall-rule/main.bicep similarity index 100% rename from modules/db-for-postgre-sql/flexible-server/firewall-rules/main.bicep rename to modules/db-for-postgre-sql/flexible-server/firewall-rule/main.bicep diff --git a/modules/db-for-postgre-sql/flexible-server/firewall-rules/main.json b/modules/db-for-postgre-sql/flexible-server/firewall-rule/main.json similarity index 100% rename from modules/db-for-postgre-sql/flexible-server/firewall-rules/main.json rename to modules/db-for-postgre-sql/flexible-server/firewall-rule/main.json diff --git a/modules/db-for-postgre-sql/flexible-server/firewall-rules/version.json b/modules/db-for-postgre-sql/flexible-server/firewall-rule/version.json similarity index 100% rename from modules/db-for-postgre-sql/flexible-server/firewall-rules/version.json rename to modules/db-for-postgre-sql/flexible-server/firewall-rule/version.json diff --git a/modules/desktop-virtualization/application-group/applications/README.md b/modules/desktop-virtualization/application-group/application/README.md similarity index 100% rename from modules/desktop-virtualization/application-group/applications/README.md rename to modules/desktop-virtualization/application-group/application/README.md diff --git a/modules/desktop-virtualization/application-group/applications/main.bicep b/modules/desktop-virtualization/application-group/application/main.bicep similarity index 100% rename from modules/desktop-virtualization/application-group/applications/main.bicep rename to modules/desktop-virtualization/application-group/application/main.bicep diff --git a/modules/desktop-virtualization/application-group/applications/main.json b/modules/desktop-virtualization/application-group/application/main.json similarity index 100% rename from modules/desktop-virtualization/application-group/applications/main.json rename to modules/desktop-virtualization/application-group/application/main.json diff --git a/modules/desktop-virtualization/application-group/applications/version.json b/modules/desktop-virtualization/application-group/application/version.json similarity index 100% rename from modules/desktop-virtualization/application-group/applications/version.json rename to modules/desktop-virtualization/application-group/application/version.json diff --git a/modules/dev-test-lab/lab/artifactsources/README.md b/modules/dev-test-lab/lab/artifactsource/README.md similarity index 100% rename from modules/dev-test-lab/lab/artifactsources/README.md rename to modules/dev-test-lab/lab/artifactsource/README.md diff --git a/modules/dev-test-lab/lab/artifactsources/main.bicep b/modules/dev-test-lab/lab/artifactsource/main.bicep similarity index 100% rename from modules/dev-test-lab/lab/artifactsources/main.bicep rename to modules/dev-test-lab/lab/artifactsource/main.bicep diff --git a/modules/dev-test-lab/lab/artifactsources/main.json b/modules/dev-test-lab/lab/artifactsource/main.json similarity index 100% rename from modules/dev-test-lab/lab/artifactsources/main.json rename to modules/dev-test-lab/lab/artifactsource/main.json diff --git a/modules/dev-test-lab/lab/artifactsources/version.json b/modules/dev-test-lab/lab/artifactsource/version.json similarity index 100% rename from modules/dev-test-lab/lab/artifactsources/version.json rename to modules/dev-test-lab/lab/artifactsource/version.json diff --git a/modules/dev-test-lab/lab/costs/README.md b/modules/dev-test-lab/lab/cost/README.md similarity index 100% rename from modules/dev-test-lab/lab/costs/README.md rename to modules/dev-test-lab/lab/cost/README.md diff --git a/modules/dev-test-lab/lab/costs/main.bicep b/modules/dev-test-lab/lab/cost/main.bicep similarity index 100% rename from modules/dev-test-lab/lab/costs/main.bicep rename to modules/dev-test-lab/lab/cost/main.bicep diff --git a/modules/dev-test-lab/lab/costs/main.json b/modules/dev-test-lab/lab/cost/main.json similarity index 100% rename from modules/dev-test-lab/lab/costs/main.json rename to modules/dev-test-lab/lab/cost/main.json diff --git a/modules/dev-test-lab/lab/costs/version.json b/modules/dev-test-lab/lab/cost/version.json similarity index 100% rename from modules/dev-test-lab/lab/costs/version.json rename to modules/dev-test-lab/lab/cost/version.json diff --git a/modules/dev-test-lab/lab/notificationchannels/README.md b/modules/dev-test-lab/lab/notificationchannel/README.md similarity index 100% rename from modules/dev-test-lab/lab/notificationchannels/README.md rename to modules/dev-test-lab/lab/notificationchannel/README.md diff --git a/modules/dev-test-lab/lab/notificationchannels/main.bicep b/modules/dev-test-lab/lab/notificationchannel/main.bicep similarity index 100% rename from modules/dev-test-lab/lab/notificationchannels/main.bicep rename to modules/dev-test-lab/lab/notificationchannel/main.bicep diff --git a/modules/dev-test-lab/lab/notificationchannels/main.json b/modules/dev-test-lab/lab/notificationchannel/main.json similarity index 100% rename from modules/dev-test-lab/lab/notificationchannels/main.json rename to modules/dev-test-lab/lab/notificationchannel/main.json diff --git a/modules/dev-test-lab/lab/notificationchannels/version.json b/modules/dev-test-lab/lab/notificationchannel/version.json similarity index 100% rename from modules/dev-test-lab/lab/notificationchannels/version.json rename to modules/dev-test-lab/lab/notificationchannel/version.json diff --git a/modules/dev-test-lab/lab/policysets/policies/README.md b/modules/dev-test-lab/lab/policyset/policies/README.md similarity index 100% rename from modules/dev-test-lab/lab/policysets/policies/README.md rename to modules/dev-test-lab/lab/policyset/policies/README.md diff --git a/modules/dev-test-lab/lab/policysets/policies/main.bicep b/modules/dev-test-lab/lab/policyset/policies/main.bicep similarity index 100% rename from modules/dev-test-lab/lab/policysets/policies/main.bicep rename to modules/dev-test-lab/lab/policyset/policies/main.bicep diff --git a/modules/dev-test-lab/lab/policysets/policies/main.json b/modules/dev-test-lab/lab/policyset/policies/main.json similarity index 100% rename from modules/dev-test-lab/lab/policysets/policies/main.json rename to modules/dev-test-lab/lab/policyset/policies/main.json diff --git a/modules/dev-test-lab/lab/policysets/policies/version.json b/modules/dev-test-lab/lab/policyset/policies/version.json similarity index 100% rename from modules/dev-test-lab/lab/policysets/policies/version.json rename to modules/dev-test-lab/lab/policyset/policies/version.json diff --git a/modules/dev-test-lab/lab/schedules/README.md b/modules/dev-test-lab/lab/schedule/README.md similarity index 100% rename from modules/dev-test-lab/lab/schedules/README.md rename to modules/dev-test-lab/lab/schedule/README.md diff --git a/modules/dev-test-lab/lab/schedules/main.bicep b/modules/dev-test-lab/lab/schedule/main.bicep similarity index 100% rename from modules/dev-test-lab/lab/schedules/main.bicep rename to modules/dev-test-lab/lab/schedule/main.bicep diff --git a/modules/dev-test-lab/lab/schedules/main.json b/modules/dev-test-lab/lab/schedule/main.json similarity index 100% rename from modules/dev-test-lab/lab/schedules/main.json rename to modules/dev-test-lab/lab/schedule/main.json diff --git a/modules/dev-test-lab/lab/schedules/version.json b/modules/dev-test-lab/lab/schedule/version.json similarity index 100% rename from modules/dev-test-lab/lab/schedules/version.json rename to modules/dev-test-lab/lab/schedule/version.json diff --git a/modules/dev-test-lab/lab/virtualnetworks/README.md b/modules/dev-test-lab/lab/virtualnetwork/README.md similarity index 100% rename from modules/dev-test-lab/lab/virtualnetworks/README.md rename to modules/dev-test-lab/lab/virtualnetwork/README.md diff --git a/modules/dev-test-lab/lab/virtualnetworks/main.bicep b/modules/dev-test-lab/lab/virtualnetwork/main.bicep similarity index 100% rename from modules/dev-test-lab/lab/virtualnetworks/main.bicep rename to modules/dev-test-lab/lab/virtualnetwork/main.bicep diff --git a/modules/dev-test-lab/lab/virtualnetworks/main.json b/modules/dev-test-lab/lab/virtualnetwork/main.json similarity index 100% rename from modules/dev-test-lab/lab/virtualnetworks/main.json rename to modules/dev-test-lab/lab/virtualnetwork/main.json diff --git a/modules/dev-test-lab/lab/virtualnetworks/version.json b/modules/dev-test-lab/lab/virtualnetwork/version.json similarity index 100% rename from modules/dev-test-lab/lab/virtualnetworks/version.json rename to modules/dev-test-lab/lab/virtualnetwork/version.json diff --git a/modules/document-db/database-account/gremlin-databases/README.md b/modules/document-db/database-account/gremlin-database/README.md similarity index 100% rename from modules/document-db/database-account/gremlin-databases/README.md rename to modules/document-db/database-account/gremlin-database/README.md diff --git a/modules/document-db/database-account/gremlin-databases/graphs/README.md b/modules/document-db/database-account/gremlin-database/graphs/README.md similarity index 100% rename from modules/document-db/database-account/gremlin-databases/graphs/README.md rename to modules/document-db/database-account/gremlin-database/graphs/README.md diff --git a/modules/document-db/database-account/gremlin-databases/graphs/main.bicep b/modules/document-db/database-account/gremlin-database/graphs/main.bicep similarity index 100% rename from modules/document-db/database-account/gremlin-databases/graphs/main.bicep rename to modules/document-db/database-account/gremlin-database/graphs/main.bicep diff --git a/modules/document-db/database-account/gremlin-databases/graphs/main.json b/modules/document-db/database-account/gremlin-database/graphs/main.json similarity index 100% rename from modules/document-db/database-account/gremlin-databases/graphs/main.json rename to modules/document-db/database-account/gremlin-database/graphs/main.json diff --git a/modules/document-db/database-account/gremlin-databases/graphs/version.json b/modules/document-db/database-account/gremlin-database/graphs/version.json similarity index 100% rename from modules/document-db/database-account/gremlin-databases/graphs/version.json rename to modules/document-db/database-account/gremlin-database/graphs/version.json diff --git a/modules/document-db/database-account/gremlin-databases/main.bicep b/modules/document-db/database-account/gremlin-database/main.bicep similarity index 100% rename from modules/document-db/database-account/gremlin-databases/main.bicep rename to modules/document-db/database-account/gremlin-database/main.bicep diff --git a/modules/document-db/database-account/gremlin-databases/main.json b/modules/document-db/database-account/gremlin-database/main.json similarity index 100% rename from modules/document-db/database-account/gremlin-databases/main.json rename to modules/document-db/database-account/gremlin-database/main.json diff --git a/modules/document-db/database-account/gremlin-databases/version.json b/modules/document-db/database-account/gremlin-database/version.json similarity index 100% rename from modules/document-db/database-account/gremlin-databases/version.json rename to modules/document-db/database-account/gremlin-database/version.json diff --git a/modules/document-db/database-account/mongodb-databases/README.md b/modules/document-db/database-account/mongodb-database/README.md similarity index 100% rename from modules/document-db/database-account/mongodb-databases/README.md rename to modules/document-db/database-account/mongodb-database/README.md diff --git a/modules/document-db/database-account/mongodb-databases/collections/README.md b/modules/document-db/database-account/mongodb-database/collections/README.md similarity index 100% rename from modules/document-db/database-account/mongodb-databases/collections/README.md rename to modules/document-db/database-account/mongodb-database/collections/README.md diff --git a/modules/document-db/database-account/mongodb-databases/collections/main.bicep b/modules/document-db/database-account/mongodb-database/collections/main.bicep similarity index 100% rename from modules/document-db/database-account/mongodb-databases/collections/main.bicep rename to modules/document-db/database-account/mongodb-database/collections/main.bicep diff --git a/modules/document-db/database-account/mongodb-databases/collections/main.json b/modules/document-db/database-account/mongodb-database/collections/main.json similarity index 100% rename from modules/document-db/database-account/mongodb-databases/collections/main.json rename to modules/document-db/database-account/mongodb-database/collections/main.json diff --git a/modules/document-db/database-account/mongodb-databases/collections/version.json b/modules/document-db/database-account/mongodb-database/collections/version.json similarity index 100% rename from modules/document-db/database-account/mongodb-databases/collections/version.json rename to modules/document-db/database-account/mongodb-database/collections/version.json diff --git a/modules/document-db/database-account/mongodb-databases/main.bicep b/modules/document-db/database-account/mongodb-database/main.bicep similarity index 100% rename from modules/document-db/database-account/mongodb-databases/main.bicep rename to modules/document-db/database-account/mongodb-database/main.bicep diff --git a/modules/document-db/database-account/mongodb-databases/main.json b/modules/document-db/database-account/mongodb-database/main.json similarity index 100% rename from modules/document-db/database-account/mongodb-databases/main.json rename to modules/document-db/database-account/mongodb-database/main.json diff --git a/modules/document-db/database-account/mongodb-databases/version.json b/modules/document-db/database-account/mongodb-database/version.json similarity index 100% rename from modules/document-db/database-account/mongodb-databases/version.json rename to modules/document-db/database-account/mongodb-database/version.json diff --git a/modules/document-db/database-account/sql-databases/README.md b/modules/document-db/database-account/sql-database/README.md similarity index 100% rename from modules/document-db/database-account/sql-databases/README.md rename to modules/document-db/database-account/sql-database/README.md diff --git a/modules/document-db/database-account/sql-databases/containers/README.md b/modules/document-db/database-account/sql-database/containers/README.md similarity index 100% rename from modules/document-db/database-account/sql-databases/containers/README.md rename to modules/document-db/database-account/sql-database/containers/README.md diff --git a/modules/document-db/database-account/sql-databases/containers/main.bicep b/modules/document-db/database-account/sql-database/containers/main.bicep similarity index 100% rename from modules/document-db/database-account/sql-databases/containers/main.bicep rename to modules/document-db/database-account/sql-database/containers/main.bicep diff --git a/modules/document-db/database-account/sql-databases/containers/main.json b/modules/document-db/database-account/sql-database/containers/main.json similarity index 100% rename from modules/document-db/database-account/sql-databases/containers/main.json rename to modules/document-db/database-account/sql-database/containers/main.json diff --git a/modules/document-db/database-account/sql-databases/containers/version.json b/modules/document-db/database-account/sql-database/containers/version.json similarity index 100% rename from modules/document-db/database-account/sql-databases/containers/version.json rename to modules/document-db/database-account/sql-database/containers/version.json diff --git a/modules/document-db/database-account/sql-databases/main.bicep b/modules/document-db/database-account/sql-database/main.bicep similarity index 100% rename from modules/document-db/database-account/sql-databases/main.bicep rename to modules/document-db/database-account/sql-database/main.bicep diff --git a/modules/document-db/database-account/sql-databases/main.json b/modules/document-db/database-account/sql-database/main.json similarity index 100% rename from modules/document-db/database-account/sql-databases/main.json rename to modules/document-db/database-account/sql-database/main.json diff --git a/modules/document-db/database-account/sql-databases/version.json b/modules/document-db/database-account/sql-database/version.json similarity index 100% rename from modules/document-db/database-account/sql-databases/version.json rename to modules/document-db/database-account/sql-database/version.json diff --git a/modules/event-grid/domain/topics/README.md b/modules/event-grid/domain/topic/README.md similarity index 100% rename from modules/event-grid/domain/topics/README.md rename to modules/event-grid/domain/topic/README.md diff --git a/modules/event-grid/domain/topics/main.bicep b/modules/event-grid/domain/topic/main.bicep similarity index 100% rename from modules/event-grid/domain/topics/main.bicep rename to modules/event-grid/domain/topic/main.bicep diff --git a/modules/event-grid/domain/topics/main.json b/modules/event-grid/domain/topic/main.json similarity index 100% rename from modules/event-grid/domain/topics/main.json rename to modules/event-grid/domain/topic/main.json diff --git a/modules/event-grid/domain/topics/version.json b/modules/event-grid/domain/topic/version.json similarity index 100% rename from modules/event-grid/domain/topics/version.json rename to modules/event-grid/domain/topic/version.json diff --git a/modules/event-grid/system-topic/eventSubscriptions/README.md b/modules/event-grid/system-topic/eventSubscription/README.md similarity index 100% rename from modules/event-grid/system-topic/eventSubscriptions/README.md rename to modules/event-grid/system-topic/eventSubscription/README.md diff --git a/modules/event-grid/system-topic/eventSubscriptions/main.bicep b/modules/event-grid/system-topic/eventSubscription/main.bicep similarity index 100% rename from modules/event-grid/system-topic/eventSubscriptions/main.bicep rename to modules/event-grid/system-topic/eventSubscription/main.bicep diff --git a/modules/event-grid/system-topic/eventSubscriptions/main.json b/modules/event-grid/system-topic/eventSubscription/main.json similarity index 100% rename from modules/event-grid/system-topic/eventSubscriptions/main.json rename to modules/event-grid/system-topic/eventSubscription/main.json diff --git a/modules/event-grid/system-topic/eventSubscriptions/version.json b/modules/event-grid/system-topic/eventSubscription/version.json similarity index 100% rename from modules/event-grid/system-topic/eventSubscriptions/version.json rename to modules/event-grid/system-topic/eventSubscription/version.json diff --git a/modules/event-grid/topic/eventSubscriptions/README.md b/modules/event-grid/topic/eventSubscription/README.md similarity index 100% rename from modules/event-grid/topic/eventSubscriptions/README.md rename to modules/event-grid/topic/eventSubscription/README.md diff --git a/modules/event-grid/topic/eventSubscriptions/main.bicep b/modules/event-grid/topic/eventSubscription/main.bicep similarity index 100% rename from modules/event-grid/topic/eventSubscriptions/main.bicep rename to modules/event-grid/topic/eventSubscription/main.bicep diff --git a/modules/event-grid/topic/eventSubscriptions/main.json b/modules/event-grid/topic/eventSubscription/main.json similarity index 100% rename from modules/event-grid/topic/eventSubscriptions/main.json rename to modules/event-grid/topic/eventSubscription/main.json diff --git a/modules/event-grid/topic/eventSubscriptions/version.json b/modules/event-grid/topic/eventSubscription/version.json similarity index 100% rename from modules/event-grid/topic/eventSubscriptions/version.json rename to modules/event-grid/topic/eventSubscription/version.json diff --git a/modules/event-hub/namespace/authorization-rules/README.md b/modules/event-hub/namespace/authorization-rule/README.md similarity index 100% rename from modules/event-hub/namespace/authorization-rules/README.md rename to modules/event-hub/namespace/authorization-rule/README.md diff --git a/modules/event-hub/namespace/authorization-rules/main.bicep b/modules/event-hub/namespace/authorization-rule/main.bicep similarity index 100% rename from modules/event-hub/namespace/authorization-rules/main.bicep rename to modules/event-hub/namespace/authorization-rule/main.bicep diff --git a/modules/event-hub/namespace/authorization-rules/main.json b/modules/event-hub/namespace/authorization-rule/main.json similarity index 100% rename from modules/event-hub/namespace/authorization-rules/main.json rename to modules/event-hub/namespace/authorization-rule/main.json diff --git a/modules/event-hub/namespace/authorization-rules/version.json b/modules/event-hub/namespace/authorization-rule/version.json similarity index 100% rename from modules/event-hub/namespace/authorization-rules/version.json rename to modules/event-hub/namespace/authorization-rule/version.json diff --git a/modules/event-hub/namespace/disaster-recovery-configs/README.md b/modules/event-hub/namespace/disaster-recovery-config/README.md similarity index 100% rename from modules/event-hub/namespace/disaster-recovery-configs/README.md rename to modules/event-hub/namespace/disaster-recovery-config/README.md diff --git a/modules/event-hub/namespace/disaster-recovery-configs/main.bicep b/modules/event-hub/namespace/disaster-recovery-config/main.bicep similarity index 100% rename from modules/event-hub/namespace/disaster-recovery-configs/main.bicep rename to modules/event-hub/namespace/disaster-recovery-config/main.bicep diff --git a/modules/event-hub/namespace/disaster-recovery-configs/main.json b/modules/event-hub/namespace/disaster-recovery-config/main.json similarity index 100% rename from modules/event-hub/namespace/disaster-recovery-configs/main.json rename to modules/event-hub/namespace/disaster-recovery-config/main.json diff --git a/modules/event-hub/namespace/disaster-recovery-configs/version.json b/modules/event-hub/namespace/disaster-recovery-config/version.json similarity index 100% rename from modules/event-hub/namespace/disaster-recovery-configs/version.json rename to modules/event-hub/namespace/disaster-recovery-config/version.json diff --git a/modules/event-hub/namespace/eventhubs/.bicep/nested_roleAssignments.bicep b/modules/event-hub/namespace/eventhub/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/event-hub/namespace/eventhubs/.bicep/nested_roleAssignments.bicep rename to modules/event-hub/namespace/eventhub/.bicep/nested_roleAssignments.bicep diff --git a/modules/event-hub/namespace/eventhubs/README.md b/modules/event-hub/namespace/eventhub/README.md similarity index 100% rename from modules/event-hub/namespace/eventhubs/README.md rename to modules/event-hub/namespace/eventhub/README.md diff --git a/modules/event-hub/namespace/eventhubs/authorization-rules/README.md b/modules/event-hub/namespace/eventhub/authorization-rules/README.md similarity index 100% rename from modules/event-hub/namespace/eventhubs/authorization-rules/README.md rename to modules/event-hub/namespace/eventhub/authorization-rules/README.md diff --git a/modules/event-hub/namespace/eventhubs/authorization-rules/main.bicep b/modules/event-hub/namespace/eventhub/authorization-rules/main.bicep similarity index 100% rename from modules/event-hub/namespace/eventhubs/authorization-rules/main.bicep rename to modules/event-hub/namespace/eventhub/authorization-rules/main.bicep diff --git a/modules/event-hub/namespace/eventhubs/authorization-rules/main.json b/modules/event-hub/namespace/eventhub/authorization-rules/main.json similarity index 100% rename from modules/event-hub/namespace/eventhubs/authorization-rules/main.json rename to modules/event-hub/namespace/eventhub/authorization-rules/main.json diff --git a/modules/event-hub/namespace/eventhubs/authorization-rules/version.json b/modules/event-hub/namespace/eventhub/authorization-rules/version.json similarity index 100% rename from modules/event-hub/namespace/eventhubs/authorization-rules/version.json rename to modules/event-hub/namespace/eventhub/authorization-rules/version.json diff --git a/modules/event-hub/namespace/eventhubs/consumergroups/README.md b/modules/event-hub/namespace/eventhub/consumergroups/README.md similarity index 100% rename from modules/event-hub/namespace/eventhubs/consumergroups/README.md rename to modules/event-hub/namespace/eventhub/consumergroups/README.md diff --git a/modules/event-hub/namespace/eventhubs/consumergroups/main.bicep b/modules/event-hub/namespace/eventhub/consumergroups/main.bicep similarity index 100% rename from modules/event-hub/namespace/eventhubs/consumergroups/main.bicep rename to modules/event-hub/namespace/eventhub/consumergroups/main.bicep diff --git a/modules/event-hub/namespace/eventhubs/consumergroups/main.json b/modules/event-hub/namespace/eventhub/consumergroups/main.json similarity index 100% rename from modules/event-hub/namespace/eventhubs/consumergroups/main.json rename to modules/event-hub/namespace/eventhub/consumergroups/main.json diff --git a/modules/event-hub/namespace/eventhubs/consumergroups/version.json b/modules/event-hub/namespace/eventhub/consumergroups/version.json similarity index 100% rename from modules/event-hub/namespace/eventhubs/consumergroups/version.json rename to modules/event-hub/namespace/eventhub/consumergroups/version.json diff --git a/modules/event-hub/namespace/eventhubs/main.bicep b/modules/event-hub/namespace/eventhub/main.bicep similarity index 100% rename from modules/event-hub/namespace/eventhubs/main.bicep rename to modules/event-hub/namespace/eventhub/main.bicep diff --git a/modules/event-hub/namespace/eventhubs/main.json b/modules/event-hub/namespace/eventhub/main.json similarity index 100% rename from modules/event-hub/namespace/eventhubs/main.json rename to modules/event-hub/namespace/eventhub/main.json diff --git a/modules/event-hub/namespace/eventhubs/version.json b/modules/event-hub/namespace/eventhub/version.json similarity index 100% rename from modules/event-hub/namespace/eventhubs/version.json rename to modules/event-hub/namespace/eventhub/version.json diff --git a/modules/event-hub/namespace/network-rule-sets/README.md b/modules/event-hub/namespace/network-rule-set/README.md similarity index 100% rename from modules/event-hub/namespace/network-rule-sets/README.md rename to modules/event-hub/namespace/network-rule-set/README.md diff --git a/modules/event-hub/namespace/network-rule-sets/main.bicep b/modules/event-hub/namespace/network-rule-set/main.bicep similarity index 100% rename from modules/event-hub/namespace/network-rule-sets/main.bicep rename to modules/event-hub/namespace/network-rule-set/main.bicep diff --git a/modules/event-hub/namespace/network-rule-sets/main.json b/modules/event-hub/namespace/network-rule-set/main.json similarity index 100% rename from modules/event-hub/namespace/network-rule-sets/main.json rename to modules/event-hub/namespace/network-rule-set/main.json diff --git a/modules/event-hub/namespace/network-rule-sets/version.json b/modules/event-hub/namespace/network-rule-set/version.json similarity index 100% rename from modules/event-hub/namespace/network-rule-sets/version.json rename to modules/event-hub/namespace/network-rule-set/version.json diff --git a/modules/healthcare-apis/workspace/dicomservices/README.md b/modules/healthcare-apis/workspace/dicomservice/README.md similarity index 100% rename from modules/healthcare-apis/workspace/dicomservices/README.md rename to modules/healthcare-apis/workspace/dicomservice/README.md diff --git a/modules/healthcare-apis/workspace/dicomservices/main.bicep b/modules/healthcare-apis/workspace/dicomservice/main.bicep similarity index 100% rename from modules/healthcare-apis/workspace/dicomservices/main.bicep rename to modules/healthcare-apis/workspace/dicomservice/main.bicep diff --git a/modules/healthcare-apis/workspace/dicomservices/main.json b/modules/healthcare-apis/workspace/dicomservice/main.json similarity index 100% rename from modules/healthcare-apis/workspace/dicomservices/main.json rename to modules/healthcare-apis/workspace/dicomservice/main.json diff --git a/modules/healthcare-apis/workspace/dicomservices/version.json b/modules/healthcare-apis/workspace/dicomservice/version.json similarity index 100% rename from modules/healthcare-apis/workspace/dicomservices/version.json rename to modules/healthcare-apis/workspace/dicomservice/version.json diff --git a/modules/healthcare-apis/workspace/fhirservices/.bicep/nested_roleAssignments.bicep b/modules/healthcare-apis/workspace/fhirservice/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/healthcare-apis/workspace/fhirservices/.bicep/nested_roleAssignments.bicep rename to modules/healthcare-apis/workspace/fhirservice/.bicep/nested_roleAssignments.bicep diff --git a/modules/healthcare-apis/workspace/fhirservices/README.md b/modules/healthcare-apis/workspace/fhirservice/README.md similarity index 100% rename from modules/healthcare-apis/workspace/fhirservices/README.md rename to modules/healthcare-apis/workspace/fhirservice/README.md diff --git a/modules/healthcare-apis/workspace/fhirservices/main.bicep b/modules/healthcare-apis/workspace/fhirservice/main.bicep similarity index 100% rename from modules/healthcare-apis/workspace/fhirservices/main.bicep rename to modules/healthcare-apis/workspace/fhirservice/main.bicep diff --git a/modules/healthcare-apis/workspace/fhirservices/main.json b/modules/healthcare-apis/workspace/fhirservice/main.json similarity index 100% rename from modules/healthcare-apis/workspace/fhirservices/main.json rename to modules/healthcare-apis/workspace/fhirservice/main.json diff --git a/modules/healthcare-apis/workspace/fhirservices/version.json b/modules/healthcare-apis/workspace/fhirservice/version.json similarity index 100% rename from modules/healthcare-apis/workspace/fhirservices/version.json rename to modules/healthcare-apis/workspace/fhirservice/version.json diff --git a/modules/healthcare-apis/workspace/iotconnectors/README.md b/modules/healthcare-apis/workspace/iotconnector/README.md similarity index 100% rename from modules/healthcare-apis/workspace/iotconnectors/README.md rename to modules/healthcare-apis/workspace/iotconnector/README.md diff --git a/modules/healthcare-apis/workspace/iotconnectors/fhirdestinations/README.md b/modules/healthcare-apis/workspace/iotconnector/fhirdestinations/README.md similarity index 100% rename from modules/healthcare-apis/workspace/iotconnectors/fhirdestinations/README.md rename to modules/healthcare-apis/workspace/iotconnector/fhirdestinations/README.md diff --git a/modules/healthcare-apis/workspace/iotconnectors/fhirdestinations/main.bicep b/modules/healthcare-apis/workspace/iotconnector/fhirdestinations/main.bicep similarity index 100% rename from modules/healthcare-apis/workspace/iotconnectors/fhirdestinations/main.bicep rename to modules/healthcare-apis/workspace/iotconnector/fhirdestinations/main.bicep diff --git a/modules/healthcare-apis/workspace/iotconnectors/fhirdestinations/main.json b/modules/healthcare-apis/workspace/iotconnector/fhirdestinations/main.json similarity index 100% rename from modules/healthcare-apis/workspace/iotconnectors/fhirdestinations/main.json rename to modules/healthcare-apis/workspace/iotconnector/fhirdestinations/main.json diff --git a/modules/healthcare-apis/workspace/iotconnectors/fhirdestinations/version.json b/modules/healthcare-apis/workspace/iotconnector/fhirdestinations/version.json similarity index 100% rename from modules/healthcare-apis/workspace/iotconnectors/fhirdestinations/version.json rename to modules/healthcare-apis/workspace/iotconnector/fhirdestinations/version.json diff --git a/modules/healthcare-apis/workspace/iotconnectors/main.bicep b/modules/healthcare-apis/workspace/iotconnector/main.bicep similarity index 100% rename from modules/healthcare-apis/workspace/iotconnectors/main.bicep rename to modules/healthcare-apis/workspace/iotconnector/main.bicep diff --git a/modules/healthcare-apis/workspace/iotconnectors/main.json b/modules/healthcare-apis/workspace/iotconnector/main.json similarity index 100% rename from modules/healthcare-apis/workspace/iotconnectors/main.json rename to modules/healthcare-apis/workspace/iotconnector/main.json diff --git a/modules/healthcare-apis/workspace/iotconnectors/version.json b/modules/healthcare-apis/workspace/iotconnector/version.json similarity index 100% rename from modules/healthcare-apis/workspace/iotconnectors/version.json rename to modules/healthcare-apis/workspace/iotconnector/version.json diff --git a/modules/insights/private-link-scope/scoped-resources/README.md b/modules/insights/private-link-scope/scoped-resource/README.md similarity index 100% rename from modules/insights/private-link-scope/scoped-resources/README.md rename to modules/insights/private-link-scope/scoped-resource/README.md diff --git a/modules/insights/private-link-scope/scoped-resources/main.bicep b/modules/insights/private-link-scope/scoped-resource/main.bicep similarity index 100% rename from modules/insights/private-link-scope/scoped-resources/main.bicep rename to modules/insights/private-link-scope/scoped-resource/main.bicep diff --git a/modules/insights/private-link-scope/scoped-resources/main.json b/modules/insights/private-link-scope/scoped-resource/main.json similarity index 100% rename from modules/insights/private-link-scope/scoped-resources/main.json rename to modules/insights/private-link-scope/scoped-resource/main.json diff --git a/modules/insights/private-link-scope/scoped-resources/version.json b/modules/insights/private-link-scope/scoped-resource/version.json similarity index 100% rename from modules/insights/private-link-scope/scoped-resources/version.json rename to modules/insights/private-link-scope/scoped-resource/version.json diff --git a/modules/key-vault/vault/access-policies/README.md b/modules/key-vault/vault/access-policy/README.md similarity index 100% rename from modules/key-vault/vault/access-policies/README.md rename to modules/key-vault/vault/access-policy/README.md diff --git a/modules/key-vault/vault/access-policies/main.bicep b/modules/key-vault/vault/access-policy/main.bicep similarity index 100% rename from modules/key-vault/vault/access-policies/main.bicep rename to modules/key-vault/vault/access-policy/main.bicep diff --git a/modules/key-vault/vault/access-policies/main.json b/modules/key-vault/vault/access-policy/main.json similarity index 100% rename from modules/key-vault/vault/access-policies/main.json rename to modules/key-vault/vault/access-policy/main.json diff --git a/modules/key-vault/vault/access-policies/version.json b/modules/key-vault/vault/access-policy/version.json similarity index 100% rename from modules/key-vault/vault/access-policies/version.json rename to modules/key-vault/vault/access-policy/version.json diff --git a/modules/key-vault/vault/keys/.bicep/nested_roleAssignments.bicep b/modules/key-vault/vault/key/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/key-vault/vault/keys/.bicep/nested_roleAssignments.bicep rename to modules/key-vault/vault/key/.bicep/nested_roleAssignments.bicep diff --git a/modules/key-vault/vault/keys/README.md b/modules/key-vault/vault/key/README.md similarity index 100% rename from modules/key-vault/vault/keys/README.md rename to modules/key-vault/vault/key/README.md diff --git a/modules/key-vault/vault/keys/main.bicep b/modules/key-vault/vault/key/main.bicep similarity index 100% rename from modules/key-vault/vault/keys/main.bicep rename to modules/key-vault/vault/key/main.bicep diff --git a/modules/key-vault/vault/keys/main.json b/modules/key-vault/vault/key/main.json similarity index 100% rename from modules/key-vault/vault/keys/main.json rename to modules/key-vault/vault/key/main.json diff --git a/modules/key-vault/vault/keys/version.json b/modules/key-vault/vault/key/version.json similarity index 100% rename from modules/key-vault/vault/keys/version.json rename to modules/key-vault/vault/key/version.json diff --git a/modules/key-vault/vault/secrets/.bicep/nested_roleAssignments.bicep b/modules/key-vault/vault/secret/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/key-vault/vault/secrets/.bicep/nested_roleAssignments.bicep rename to modules/key-vault/vault/secret/.bicep/nested_roleAssignments.bicep diff --git a/modules/key-vault/vault/secrets/README.md b/modules/key-vault/vault/secret/README.md similarity index 100% rename from modules/key-vault/vault/secrets/README.md rename to modules/key-vault/vault/secret/README.md diff --git a/modules/key-vault/vault/secrets/main.bicep b/modules/key-vault/vault/secret/main.bicep similarity index 100% rename from modules/key-vault/vault/secrets/main.bicep rename to modules/key-vault/vault/secret/main.bicep diff --git a/modules/key-vault/vault/secrets/main.json b/modules/key-vault/vault/secret/main.json similarity index 100% rename from modules/key-vault/vault/secrets/main.json rename to modules/key-vault/vault/secret/main.json diff --git a/modules/key-vault/vault/secrets/version.json b/modules/key-vault/vault/secret/version.json similarity index 100% rename from modules/key-vault/vault/secrets/version.json rename to modules/key-vault/vault/secret/version.json diff --git a/modules/machine-learning-services/workspace/computes/README.md b/modules/machine-learning-services/workspace/compute/README.md similarity index 100% rename from modules/machine-learning-services/workspace/computes/README.md rename to modules/machine-learning-services/workspace/compute/README.md diff --git a/modules/machine-learning-services/workspace/computes/main.bicep b/modules/machine-learning-services/workspace/compute/main.bicep similarity index 100% rename from modules/machine-learning-services/workspace/computes/main.bicep rename to modules/machine-learning-services/workspace/compute/main.bicep diff --git a/modules/machine-learning-services/workspace/computes/main.json b/modules/machine-learning-services/workspace/compute/main.json similarity index 100% rename from modules/machine-learning-services/workspace/computes/main.json rename to modules/machine-learning-services/workspace/compute/main.json diff --git a/modules/machine-learning-services/workspace/computes/version.json b/modules/machine-learning-services/workspace/compute/version.json similarity index 100% rename from modules/machine-learning-services/workspace/computes/version.json rename to modules/machine-learning-services/workspace/compute/version.json diff --git a/modules/net-app/net-app-account/capacity-pools/.bicep/nested_roleAssignments.bicep b/modules/net-app/net-app-account/capacity-pool/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/net-app/net-app-account/capacity-pools/.bicep/nested_roleAssignments.bicep rename to modules/net-app/net-app-account/capacity-pool/.bicep/nested_roleAssignments.bicep diff --git a/modules/net-app/net-app-account/capacity-pools/README.md b/modules/net-app/net-app-account/capacity-pool/README.md similarity index 100% rename from modules/net-app/net-app-account/capacity-pools/README.md rename to modules/net-app/net-app-account/capacity-pool/README.md diff --git a/modules/net-app/net-app-account/capacity-pools/main.bicep b/modules/net-app/net-app-account/capacity-pool/main.bicep similarity index 100% rename from modules/net-app/net-app-account/capacity-pools/main.bicep rename to modules/net-app/net-app-account/capacity-pool/main.bicep diff --git a/modules/net-app/net-app-account/capacity-pools/main.json b/modules/net-app/net-app-account/capacity-pool/main.json similarity index 100% rename from modules/net-app/net-app-account/capacity-pools/main.json rename to modules/net-app/net-app-account/capacity-pool/main.json diff --git a/modules/net-app/net-app-account/capacity-pools/version.json b/modules/net-app/net-app-account/capacity-pool/version.json similarity index 100% rename from modules/net-app/net-app-account/capacity-pools/version.json rename to modules/net-app/net-app-account/capacity-pool/version.json diff --git a/modules/net-app/net-app-account/capacity-pools/volumes/.bicep/nested_roleAssignments.bicep b/modules/net-app/net-app-account/capacity-pool/volumes/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/net-app/net-app-account/capacity-pools/volumes/.bicep/nested_roleAssignments.bicep rename to modules/net-app/net-app-account/capacity-pool/volumes/.bicep/nested_roleAssignments.bicep diff --git a/modules/net-app/net-app-account/capacity-pools/volumes/README.md b/modules/net-app/net-app-account/capacity-pool/volumes/README.md similarity index 100% rename from modules/net-app/net-app-account/capacity-pools/volumes/README.md rename to modules/net-app/net-app-account/capacity-pool/volumes/README.md diff --git a/modules/net-app/net-app-account/capacity-pools/volumes/main.bicep b/modules/net-app/net-app-account/capacity-pool/volumes/main.bicep similarity index 100% rename from modules/net-app/net-app-account/capacity-pools/volumes/main.bicep rename to modules/net-app/net-app-account/capacity-pool/volumes/main.bicep diff --git a/modules/net-app/net-app-account/capacity-pools/volumes/main.json b/modules/net-app/net-app-account/capacity-pool/volumes/main.json similarity index 100% rename from modules/net-app/net-app-account/capacity-pools/volumes/main.json rename to modules/net-app/net-app-account/capacity-pool/volumes/main.json diff --git a/modules/net-app/net-app-account/capacity-pools/volumes/version.json b/modules/net-app/net-app-account/capacity-pool/volumes/version.json similarity index 100% rename from modules/net-app/net-app-account/capacity-pools/volumes/version.json rename to modules/net-app/net-app-account/capacity-pool/volumes/version.json diff --git a/modules/network/dns-forwarding-ruleset/forwarding-rules/README.md b/modules/network/dns-forwarding-ruleset/forwarding-rule/README.md similarity index 100% rename from modules/network/dns-forwarding-ruleset/forwarding-rules/README.md rename to modules/network/dns-forwarding-ruleset/forwarding-rule/README.md diff --git a/modules/network/dns-forwarding-ruleset/forwarding-rules/main.bicep b/modules/network/dns-forwarding-ruleset/forwarding-rule/main.bicep similarity index 100% rename from modules/network/dns-forwarding-ruleset/forwarding-rules/main.bicep rename to modules/network/dns-forwarding-ruleset/forwarding-rule/main.bicep diff --git a/modules/network/dns-forwarding-ruleset/forwarding-rules/main.json b/modules/network/dns-forwarding-ruleset/forwarding-rule/main.json similarity index 100% rename from modules/network/dns-forwarding-ruleset/forwarding-rules/main.json rename to modules/network/dns-forwarding-ruleset/forwarding-rule/main.json diff --git a/modules/network/dns-forwarding-ruleset/forwarding-rules/version.json b/modules/network/dns-forwarding-ruleset/forwarding-rule/version.json similarity index 100% rename from modules/network/dns-forwarding-ruleset/forwarding-rules/version.json rename to modules/network/dns-forwarding-ruleset/forwarding-rule/version.json diff --git a/modules/network/dns-forwarding-ruleset/virtual-network-links/README.md b/modules/network/dns-forwarding-ruleset/virtual-network-link/README.md similarity index 100% rename from modules/network/dns-forwarding-ruleset/virtual-network-links/README.md rename to modules/network/dns-forwarding-ruleset/virtual-network-link/README.md diff --git a/modules/network/dns-forwarding-ruleset/virtual-network-links/main.bicep b/modules/network/dns-forwarding-ruleset/virtual-network-link/main.bicep similarity index 100% rename from modules/network/dns-forwarding-ruleset/virtual-network-links/main.bicep rename to modules/network/dns-forwarding-ruleset/virtual-network-link/main.bicep diff --git a/modules/network/dns-forwarding-ruleset/virtual-network-links/main.json b/modules/network/dns-forwarding-ruleset/virtual-network-link/main.json similarity index 100% rename from modules/network/dns-forwarding-ruleset/virtual-network-links/main.json rename to modules/network/dns-forwarding-ruleset/virtual-network-link/main.json diff --git a/modules/network/dns-forwarding-ruleset/virtual-network-links/version.json b/modules/network/dns-forwarding-ruleset/virtual-network-link/version.json similarity index 100% rename from modules/network/dns-forwarding-ruleset/virtual-network-links/version.json rename to modules/network/dns-forwarding-ruleset/virtual-network-link/version.json diff --git a/modules/network/firewall-policy/rule-collection-groups/README.md b/modules/network/firewall-policy/rule-collection-group/README.md similarity index 100% rename from modules/network/firewall-policy/rule-collection-groups/README.md rename to modules/network/firewall-policy/rule-collection-group/README.md diff --git a/modules/network/firewall-policy/rule-collection-groups/main.bicep b/modules/network/firewall-policy/rule-collection-group/main.bicep similarity index 100% rename from modules/network/firewall-policy/rule-collection-groups/main.bicep rename to modules/network/firewall-policy/rule-collection-group/main.bicep diff --git a/modules/network/firewall-policy/rule-collection-groups/main.json b/modules/network/firewall-policy/rule-collection-group/main.json similarity index 100% rename from modules/network/firewall-policy/rule-collection-groups/main.json rename to modules/network/firewall-policy/rule-collection-group/main.json diff --git a/modules/network/firewall-policy/rule-collection-groups/version.json b/modules/network/firewall-policy/rule-collection-group/version.json similarity index 100% rename from modules/network/firewall-policy/rule-collection-groups/version.json rename to modules/network/firewall-policy/rule-collection-group/version.json diff --git a/modules/network/load-balancer/backend-address-pools/README.md b/modules/network/load-balancer/backend-address-pool/README.md similarity index 100% rename from modules/network/load-balancer/backend-address-pools/README.md rename to modules/network/load-balancer/backend-address-pool/README.md diff --git a/modules/network/load-balancer/backend-address-pools/main.bicep b/modules/network/load-balancer/backend-address-pool/main.bicep similarity index 100% rename from modules/network/load-balancer/backend-address-pools/main.bicep rename to modules/network/load-balancer/backend-address-pool/main.bicep diff --git a/modules/network/load-balancer/backend-address-pools/main.json b/modules/network/load-balancer/backend-address-pool/main.json similarity index 100% rename from modules/network/load-balancer/backend-address-pools/main.json rename to modules/network/load-balancer/backend-address-pool/main.json diff --git a/modules/network/load-balancer/backend-address-pools/version.json b/modules/network/load-balancer/backend-address-pool/version.json similarity index 100% rename from modules/network/load-balancer/backend-address-pools/version.json rename to modules/network/load-balancer/backend-address-pool/version.json diff --git a/modules/network/load-balancer/inbound-nat-rules/README.md b/modules/network/load-balancer/inbound-nat-rule/README.md similarity index 100% rename from modules/network/load-balancer/inbound-nat-rules/README.md rename to modules/network/load-balancer/inbound-nat-rule/README.md diff --git a/modules/network/load-balancer/inbound-nat-rules/main.bicep b/modules/network/load-balancer/inbound-nat-rule/main.bicep similarity index 100% rename from modules/network/load-balancer/inbound-nat-rules/main.bicep rename to modules/network/load-balancer/inbound-nat-rule/main.bicep diff --git a/modules/network/load-balancer/inbound-nat-rules/main.json b/modules/network/load-balancer/inbound-nat-rule/main.json similarity index 100% rename from modules/network/load-balancer/inbound-nat-rules/main.json rename to modules/network/load-balancer/inbound-nat-rule/main.json diff --git a/modules/network/load-balancer/inbound-nat-rules/version.json b/modules/network/load-balancer/inbound-nat-rule/version.json similarity index 100% rename from modules/network/load-balancer/inbound-nat-rules/version.json rename to modules/network/load-balancer/inbound-nat-rule/version.json diff --git a/modules/network/network-manager/connectivity-configurations/README.md b/modules/network/network-manager/connectivity-configuration/README.md similarity index 100% rename from modules/network/network-manager/connectivity-configurations/README.md rename to modules/network/network-manager/connectivity-configuration/README.md diff --git a/modules/network/network-manager/connectivity-configurations/main.bicep b/modules/network/network-manager/connectivity-configuration/main.bicep similarity index 100% rename from modules/network/network-manager/connectivity-configurations/main.bicep rename to modules/network/network-manager/connectivity-configuration/main.bicep diff --git a/modules/network/network-manager/connectivity-configurations/main.json b/modules/network/network-manager/connectivity-configuration/main.json similarity index 100% rename from modules/network/network-manager/connectivity-configurations/main.json rename to modules/network/network-manager/connectivity-configuration/main.json diff --git a/modules/network/network-manager/connectivity-configurations/version.json b/modules/network/network-manager/connectivity-configuration/version.json similarity index 100% rename from modules/network/network-manager/connectivity-configurations/version.json rename to modules/network/network-manager/connectivity-configuration/version.json diff --git a/modules/network/network-manager/network-groups/README.md b/modules/network/network-manager/network-group/README.md similarity index 100% rename from modules/network/network-manager/network-groups/README.md rename to modules/network/network-manager/network-group/README.md diff --git a/modules/network/network-manager/network-groups/main.bicep b/modules/network/network-manager/network-group/main.bicep similarity index 100% rename from modules/network/network-manager/network-groups/main.bicep rename to modules/network/network-manager/network-group/main.bicep diff --git a/modules/network/network-manager/network-groups/main.json b/modules/network/network-manager/network-group/main.json similarity index 100% rename from modules/network/network-manager/network-groups/main.json rename to modules/network/network-manager/network-group/main.json diff --git a/modules/network/network-manager/network-groups/static-members/README.md b/modules/network/network-manager/network-group/static-members/README.md similarity index 100% rename from modules/network/network-manager/network-groups/static-members/README.md rename to modules/network/network-manager/network-group/static-members/README.md diff --git a/modules/network/network-manager/network-groups/static-members/main.bicep b/modules/network/network-manager/network-group/static-members/main.bicep similarity index 100% rename from modules/network/network-manager/network-groups/static-members/main.bicep rename to modules/network/network-manager/network-group/static-members/main.bicep diff --git a/modules/network/network-manager/network-groups/static-members/main.json b/modules/network/network-manager/network-group/static-members/main.json similarity index 100% rename from modules/network/network-manager/network-groups/static-members/main.json rename to modules/network/network-manager/network-group/static-members/main.json diff --git a/modules/network/network-manager/network-groups/static-members/version.json b/modules/network/network-manager/network-group/static-members/version.json similarity index 100% rename from modules/network/network-manager/network-groups/static-members/version.json rename to modules/network/network-manager/network-group/static-members/version.json diff --git a/modules/network/network-manager/network-groups/version.json b/modules/network/network-manager/network-group/version.json similarity index 100% rename from modules/network/network-manager/network-groups/version.json rename to modules/network/network-manager/network-group/version.json diff --git a/modules/network/network-manager/scope-connections/README.md b/modules/network/network-manager/scope-connection/README.md similarity index 100% rename from modules/network/network-manager/scope-connections/README.md rename to modules/network/network-manager/scope-connection/README.md diff --git a/modules/network/network-manager/scope-connections/main.bicep b/modules/network/network-manager/scope-connection/main.bicep similarity index 100% rename from modules/network/network-manager/scope-connections/main.bicep rename to modules/network/network-manager/scope-connection/main.bicep diff --git a/modules/network/network-manager/scope-connections/main.json b/modules/network/network-manager/scope-connection/main.json similarity index 100% rename from modules/network/network-manager/scope-connections/main.json rename to modules/network/network-manager/scope-connection/main.json diff --git a/modules/network/network-manager/scope-connections/version.json b/modules/network/network-manager/scope-connection/version.json similarity index 100% rename from modules/network/network-manager/scope-connections/version.json rename to modules/network/network-manager/scope-connection/version.json diff --git a/modules/network/network-manager/security-admin-configurations/README.md b/modules/network/network-manager/security-admin-configuration/README.md similarity index 100% rename from modules/network/network-manager/security-admin-configurations/README.md rename to modules/network/network-manager/security-admin-configuration/README.md diff --git a/modules/network/network-manager/security-admin-configurations/main.bicep b/modules/network/network-manager/security-admin-configuration/main.bicep similarity index 100% rename from modules/network/network-manager/security-admin-configurations/main.bicep rename to modules/network/network-manager/security-admin-configuration/main.bicep diff --git a/modules/network/network-manager/security-admin-configurations/main.json b/modules/network/network-manager/security-admin-configuration/main.json similarity index 100% rename from modules/network/network-manager/security-admin-configurations/main.json rename to modules/network/network-manager/security-admin-configuration/main.json diff --git a/modules/network/network-manager/security-admin-configurations/rule-collections/README.md b/modules/network/network-manager/security-admin-configuration/rule-collections/README.md similarity index 100% rename from modules/network/network-manager/security-admin-configurations/rule-collections/README.md rename to modules/network/network-manager/security-admin-configuration/rule-collections/README.md diff --git a/modules/network/network-manager/security-admin-configurations/rule-collections/main.bicep b/modules/network/network-manager/security-admin-configuration/rule-collections/main.bicep similarity index 100% rename from modules/network/network-manager/security-admin-configurations/rule-collections/main.bicep rename to modules/network/network-manager/security-admin-configuration/rule-collections/main.bicep diff --git a/modules/network/network-manager/security-admin-configurations/rule-collections/main.json b/modules/network/network-manager/security-admin-configuration/rule-collections/main.json similarity index 100% rename from modules/network/network-manager/security-admin-configurations/rule-collections/main.json rename to modules/network/network-manager/security-admin-configuration/rule-collections/main.json diff --git a/modules/network/network-manager/security-admin-configurations/rule-collections/rules/README.md b/modules/network/network-manager/security-admin-configuration/rule-collections/rules/README.md similarity index 100% rename from modules/network/network-manager/security-admin-configurations/rule-collections/rules/README.md rename to modules/network/network-manager/security-admin-configuration/rule-collections/rules/README.md diff --git a/modules/network/network-manager/security-admin-configurations/rule-collections/rules/main.bicep b/modules/network/network-manager/security-admin-configuration/rule-collections/rules/main.bicep similarity index 100% rename from modules/network/network-manager/security-admin-configurations/rule-collections/rules/main.bicep rename to modules/network/network-manager/security-admin-configuration/rule-collections/rules/main.bicep diff --git a/modules/network/network-manager/security-admin-configurations/rule-collections/rules/main.json b/modules/network/network-manager/security-admin-configuration/rule-collections/rules/main.json similarity index 100% rename from modules/network/network-manager/security-admin-configurations/rule-collections/rules/main.json rename to modules/network/network-manager/security-admin-configuration/rule-collections/rules/main.json diff --git a/modules/network/network-manager/security-admin-configurations/rule-collections/rules/version.json b/modules/network/network-manager/security-admin-configuration/rule-collections/rules/version.json similarity index 100% rename from modules/network/network-manager/security-admin-configurations/rule-collections/rules/version.json rename to modules/network/network-manager/security-admin-configuration/rule-collections/rules/version.json diff --git a/modules/network/network-manager/security-admin-configurations/rule-collections/version.json b/modules/network/network-manager/security-admin-configuration/rule-collections/version.json similarity index 100% rename from modules/network/network-manager/security-admin-configurations/rule-collections/version.json rename to modules/network/network-manager/security-admin-configuration/rule-collections/version.json diff --git a/modules/network/network-manager/security-admin-configurations/version.json b/modules/network/network-manager/security-admin-configuration/version.json similarity index 100% rename from modules/network/network-manager/security-admin-configurations/version.json rename to modules/network/network-manager/security-admin-configuration/version.json diff --git a/modules/network/network-security-group/security-rules/README.md b/modules/network/network-security-group/security-rule/README.md similarity index 100% rename from modules/network/network-security-group/security-rules/README.md rename to modules/network/network-security-group/security-rule/README.md diff --git a/modules/network/network-security-group/security-rules/main.bicep b/modules/network/network-security-group/security-rule/main.bicep similarity index 100% rename from modules/network/network-security-group/security-rules/main.bicep rename to modules/network/network-security-group/security-rule/main.bicep diff --git a/modules/network/network-security-group/security-rules/main.json b/modules/network/network-security-group/security-rule/main.json similarity index 100% rename from modules/network/network-security-group/security-rules/main.json rename to modules/network/network-security-group/security-rule/main.json diff --git a/modules/network/network-security-group/security-rules/version.json b/modules/network/network-security-group/security-rule/version.json similarity index 100% rename from modules/network/network-security-group/security-rules/version.json rename to modules/network/network-security-group/security-rule/version.json diff --git a/modules/network/network-watcher/connection-monitors/README.md b/modules/network/network-watcher/connection-monitor/README.md similarity index 100% rename from modules/network/network-watcher/connection-monitors/README.md rename to modules/network/network-watcher/connection-monitor/README.md diff --git a/modules/network/network-watcher/connection-monitors/main.bicep b/modules/network/network-watcher/connection-monitor/main.bicep similarity index 100% rename from modules/network/network-watcher/connection-monitors/main.bicep rename to modules/network/network-watcher/connection-monitor/main.bicep diff --git a/modules/network/network-watcher/connection-monitors/main.json b/modules/network/network-watcher/connection-monitor/main.json similarity index 100% rename from modules/network/network-watcher/connection-monitors/main.json rename to modules/network/network-watcher/connection-monitor/main.json diff --git a/modules/network/network-watcher/connection-monitors/version.json b/modules/network/network-watcher/connection-monitor/version.json similarity index 100% rename from modules/network/network-watcher/connection-monitors/version.json rename to modules/network/network-watcher/connection-monitor/version.json diff --git a/modules/network/network-watcher/flow-logs/README.md b/modules/network/network-watcher/flow-log/README.md similarity index 100% rename from modules/network/network-watcher/flow-logs/README.md rename to modules/network/network-watcher/flow-log/README.md diff --git a/modules/network/network-watcher/flow-logs/main.bicep b/modules/network/network-watcher/flow-log/main.bicep similarity index 100% rename from modules/network/network-watcher/flow-logs/main.bicep rename to modules/network/network-watcher/flow-log/main.bicep diff --git a/modules/network/network-watcher/flow-logs/main.json b/modules/network/network-watcher/flow-log/main.json similarity index 100% rename from modules/network/network-watcher/flow-logs/main.json rename to modules/network/network-watcher/flow-log/main.json diff --git a/modules/network/network-watcher/flow-logs/version.json b/modules/network/network-watcher/flow-log/version.json similarity index 100% rename from modules/network/network-watcher/flow-logs/version.json rename to modules/network/network-watcher/flow-log/version.json diff --git a/modules/network/private-dns-zone/virtual-network-links/README.md b/modules/network/private-dns-zone/virtual-network-link/README.md similarity index 100% rename from modules/network/private-dns-zone/virtual-network-links/README.md rename to modules/network/private-dns-zone/virtual-network-link/README.md diff --git a/modules/network/private-dns-zone/virtual-network-links/main.bicep b/modules/network/private-dns-zone/virtual-network-link/main.bicep similarity index 100% rename from modules/network/private-dns-zone/virtual-network-links/main.bicep rename to modules/network/private-dns-zone/virtual-network-link/main.bicep diff --git a/modules/network/private-dns-zone/virtual-network-links/main.json b/modules/network/private-dns-zone/virtual-network-link/main.json similarity index 100% rename from modules/network/private-dns-zone/virtual-network-links/main.json rename to modules/network/private-dns-zone/virtual-network-link/main.json diff --git a/modules/network/private-dns-zone/virtual-network-links/version.json b/modules/network/private-dns-zone/virtual-network-link/version.json similarity index 100% rename from modules/network/private-dns-zone/virtual-network-links/version.json rename to modules/network/private-dns-zone/virtual-network-link/version.json diff --git a/modules/network/private-endpoint/private-dns-zone-groups/README.md b/modules/network/private-endpoint/private-dns-zone-group/README.md similarity index 100% rename from modules/network/private-endpoint/private-dns-zone-groups/README.md rename to modules/network/private-endpoint/private-dns-zone-group/README.md diff --git a/modules/network/private-endpoint/private-dns-zone-groups/main.bicep b/modules/network/private-endpoint/private-dns-zone-group/main.bicep similarity index 100% rename from modules/network/private-endpoint/private-dns-zone-groups/main.bicep rename to modules/network/private-endpoint/private-dns-zone-group/main.bicep diff --git a/modules/network/private-endpoint/private-dns-zone-groups/main.json b/modules/network/private-endpoint/private-dns-zone-group/main.json similarity index 100% rename from modules/network/private-endpoint/private-dns-zone-groups/main.json rename to modules/network/private-endpoint/private-dns-zone-group/main.json diff --git a/modules/network/private-endpoint/private-dns-zone-groups/version.json b/modules/network/private-endpoint/private-dns-zone-group/version.json similarity index 100% rename from modules/network/private-endpoint/private-dns-zone-groups/version.json rename to modules/network/private-endpoint/private-dns-zone-group/version.json diff --git a/modules/network/virtual-hub/hub-route-tables/README.md b/modules/network/virtual-hub/hub-route-table/README.md similarity index 100% rename from modules/network/virtual-hub/hub-route-tables/README.md rename to modules/network/virtual-hub/hub-route-table/README.md diff --git a/modules/network/virtual-hub/hub-route-tables/main.bicep b/modules/network/virtual-hub/hub-route-table/main.bicep similarity index 100% rename from modules/network/virtual-hub/hub-route-tables/main.bicep rename to modules/network/virtual-hub/hub-route-table/main.bicep diff --git a/modules/network/virtual-hub/hub-route-tables/main.json b/modules/network/virtual-hub/hub-route-table/main.json similarity index 100% rename from modules/network/virtual-hub/hub-route-tables/main.json rename to modules/network/virtual-hub/hub-route-table/main.json diff --git a/modules/network/virtual-hub/hub-route-tables/version.json b/modules/network/virtual-hub/hub-route-table/version.json similarity index 100% rename from modules/network/virtual-hub/hub-route-tables/version.json rename to modules/network/virtual-hub/hub-route-table/version.json diff --git a/modules/network/virtual-hub/hub-virtual-network-connections/README.md b/modules/network/virtual-hub/hub-virtual-network-connection/README.md similarity index 100% rename from modules/network/virtual-hub/hub-virtual-network-connections/README.md rename to modules/network/virtual-hub/hub-virtual-network-connection/README.md diff --git a/modules/network/virtual-hub/hub-virtual-network-connections/main.bicep b/modules/network/virtual-hub/hub-virtual-network-connection/main.bicep similarity index 100% rename from modules/network/virtual-hub/hub-virtual-network-connections/main.bicep rename to modules/network/virtual-hub/hub-virtual-network-connection/main.bicep diff --git a/modules/network/virtual-hub/hub-virtual-network-connections/main.json b/modules/network/virtual-hub/hub-virtual-network-connection/main.json similarity index 100% rename from modules/network/virtual-hub/hub-virtual-network-connections/main.json rename to modules/network/virtual-hub/hub-virtual-network-connection/main.json diff --git a/modules/network/virtual-hub/hub-virtual-network-connections/version.json b/modules/network/virtual-hub/hub-virtual-network-connection/version.json similarity index 100% rename from modules/network/virtual-hub/hub-virtual-network-connections/version.json rename to modules/network/virtual-hub/hub-virtual-network-connection/version.json diff --git a/modules/network/virtual-network-gateway/nat-rules/README.md b/modules/network/virtual-network-gateway/nat-rule/README.md similarity index 100% rename from modules/network/virtual-network-gateway/nat-rules/README.md rename to modules/network/virtual-network-gateway/nat-rule/README.md diff --git a/modules/network/virtual-network-gateway/nat-rules/main.bicep b/modules/network/virtual-network-gateway/nat-rule/main.bicep similarity index 100% rename from modules/network/virtual-network-gateway/nat-rules/main.bicep rename to modules/network/virtual-network-gateway/nat-rule/main.bicep diff --git a/modules/network/virtual-network-gateway/nat-rules/main.json b/modules/network/virtual-network-gateway/nat-rule/main.json similarity index 100% rename from modules/network/virtual-network-gateway/nat-rules/main.json rename to modules/network/virtual-network-gateway/nat-rule/main.json diff --git a/modules/network/virtual-network-gateway/nat-rules/version.json b/modules/network/virtual-network-gateway/nat-rule/version.json similarity index 100% rename from modules/network/virtual-network-gateway/nat-rules/version.json rename to modules/network/virtual-network-gateway/nat-rule/version.json diff --git a/modules/network/virtual-network/subnets/.bicep/nested_roleAssignments.bicep b/modules/network/virtual-network/subnet/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/network/virtual-network/subnets/.bicep/nested_roleAssignments.bicep rename to modules/network/virtual-network/subnet/.bicep/nested_roleAssignments.bicep diff --git a/modules/network/virtual-network/subnets/README.md b/modules/network/virtual-network/subnet/README.md similarity index 100% rename from modules/network/virtual-network/subnets/README.md rename to modules/network/virtual-network/subnet/README.md diff --git a/modules/network/virtual-network/subnets/main.bicep b/modules/network/virtual-network/subnet/main.bicep similarity index 100% rename from modules/network/virtual-network/subnets/main.bicep rename to modules/network/virtual-network/subnet/main.bicep diff --git a/modules/network/virtual-network/subnets/main.json b/modules/network/virtual-network/subnet/main.json similarity index 100% rename from modules/network/virtual-network/subnets/main.json rename to modules/network/virtual-network/subnet/main.json diff --git a/modules/network/virtual-network/subnets/version.json b/modules/network/virtual-network/subnet/version.json similarity index 100% rename from modules/network/virtual-network/subnets/version.json rename to modules/network/virtual-network/subnet/version.json diff --git a/modules/network/virtual-network/virtual-network-peerings/README.md b/modules/network/virtual-network/virtual-network-peering/README.md similarity index 100% rename from modules/network/virtual-network/virtual-network-peerings/README.md rename to modules/network/virtual-network/virtual-network-peering/README.md diff --git a/modules/network/virtual-network/virtual-network-peerings/main.bicep b/modules/network/virtual-network/virtual-network-peering/main.bicep similarity index 100% rename from modules/network/virtual-network/virtual-network-peerings/main.bicep rename to modules/network/virtual-network/virtual-network-peering/main.bicep diff --git a/modules/network/virtual-network/virtual-network-peerings/main.json b/modules/network/virtual-network/virtual-network-peering/main.json similarity index 100% rename from modules/network/virtual-network/virtual-network-peerings/main.json rename to modules/network/virtual-network/virtual-network-peering/main.json diff --git a/modules/network/virtual-network/virtual-network-peerings/version.json b/modules/network/virtual-network/virtual-network-peering/version.json similarity index 100% rename from modules/network/virtual-network/virtual-network-peerings/version.json rename to modules/network/virtual-network/virtual-network-peering/version.json diff --git a/modules/network/vpn-gateway/nat-rules/README.md b/modules/network/vpn-gateway/nat-rule/README.md similarity index 100% rename from modules/network/vpn-gateway/nat-rules/README.md rename to modules/network/vpn-gateway/nat-rule/README.md diff --git a/modules/network/vpn-gateway/nat-rules/main.bicep b/modules/network/vpn-gateway/nat-rule/main.bicep similarity index 100% rename from modules/network/vpn-gateway/nat-rules/main.bicep rename to modules/network/vpn-gateway/nat-rule/main.bicep diff --git a/modules/network/vpn-gateway/nat-rules/main.json b/modules/network/vpn-gateway/nat-rule/main.json similarity index 100% rename from modules/network/vpn-gateway/nat-rules/main.json rename to modules/network/vpn-gateway/nat-rule/main.json diff --git a/modules/network/vpn-gateway/nat-rules/version.json b/modules/network/vpn-gateway/nat-rule/version.json similarity index 100% rename from modules/network/vpn-gateway/nat-rules/version.json rename to modules/network/vpn-gateway/nat-rule/version.json diff --git a/modules/operational-insights/workspace/data-exports/README.md b/modules/operational-insights/workspace/data-export/README.md similarity index 100% rename from modules/operational-insights/workspace/data-exports/README.md rename to modules/operational-insights/workspace/data-export/README.md diff --git a/modules/operational-insights/workspace/data-exports/main.bicep b/modules/operational-insights/workspace/data-export/main.bicep similarity index 100% rename from modules/operational-insights/workspace/data-exports/main.bicep rename to modules/operational-insights/workspace/data-export/main.bicep diff --git a/modules/operational-insights/workspace/data-exports/main.json b/modules/operational-insights/workspace/data-export/main.json similarity index 100% rename from modules/operational-insights/workspace/data-exports/main.json rename to modules/operational-insights/workspace/data-export/main.json diff --git a/modules/operational-insights/workspace/data-exports/version.json b/modules/operational-insights/workspace/data-export/version.json similarity index 100% rename from modules/operational-insights/workspace/data-exports/version.json rename to modules/operational-insights/workspace/data-export/version.json diff --git a/modules/operational-insights/workspace/data-sources/README.md b/modules/operational-insights/workspace/data-source/README.md similarity index 100% rename from modules/operational-insights/workspace/data-sources/README.md rename to modules/operational-insights/workspace/data-source/README.md diff --git a/modules/operational-insights/workspace/data-sources/main.bicep b/modules/operational-insights/workspace/data-source/main.bicep similarity index 100% rename from modules/operational-insights/workspace/data-sources/main.bicep rename to modules/operational-insights/workspace/data-source/main.bicep diff --git a/modules/operational-insights/workspace/data-sources/main.json b/modules/operational-insights/workspace/data-source/main.json similarity index 100% rename from modules/operational-insights/workspace/data-sources/main.json rename to modules/operational-insights/workspace/data-source/main.json diff --git a/modules/operational-insights/workspace/data-sources/version.json b/modules/operational-insights/workspace/data-source/version.json similarity index 100% rename from modules/operational-insights/workspace/data-sources/version.json rename to modules/operational-insights/workspace/data-source/version.json diff --git a/modules/operational-insights/workspace/linked-services/README.md b/modules/operational-insights/workspace/linked-service/README.md similarity index 100% rename from modules/operational-insights/workspace/linked-services/README.md rename to modules/operational-insights/workspace/linked-service/README.md diff --git a/modules/operational-insights/workspace/linked-services/main.bicep b/modules/operational-insights/workspace/linked-service/main.bicep similarity index 100% rename from modules/operational-insights/workspace/linked-services/main.bicep rename to modules/operational-insights/workspace/linked-service/main.bicep diff --git a/modules/operational-insights/workspace/linked-services/main.json b/modules/operational-insights/workspace/linked-service/main.json similarity index 100% rename from modules/operational-insights/workspace/linked-services/main.json rename to modules/operational-insights/workspace/linked-service/main.json diff --git a/modules/operational-insights/workspace/linked-services/version.json b/modules/operational-insights/workspace/linked-service/version.json similarity index 100% rename from modules/operational-insights/workspace/linked-services/version.json rename to modules/operational-insights/workspace/linked-service/version.json diff --git a/modules/operational-insights/workspace/linked-storage-accounts/README.md b/modules/operational-insights/workspace/linked-storage-account/README.md similarity index 100% rename from modules/operational-insights/workspace/linked-storage-accounts/README.md rename to modules/operational-insights/workspace/linked-storage-account/README.md diff --git a/modules/operational-insights/workspace/linked-storage-accounts/main.bicep b/modules/operational-insights/workspace/linked-storage-account/main.bicep similarity index 100% rename from modules/operational-insights/workspace/linked-storage-accounts/main.bicep rename to modules/operational-insights/workspace/linked-storage-account/main.bicep diff --git a/modules/operational-insights/workspace/linked-storage-accounts/main.json b/modules/operational-insights/workspace/linked-storage-account/main.json similarity index 100% rename from modules/operational-insights/workspace/linked-storage-accounts/main.json rename to modules/operational-insights/workspace/linked-storage-account/main.json diff --git a/modules/operational-insights/workspace/linked-storage-accounts/version.json b/modules/operational-insights/workspace/linked-storage-account/version.json similarity index 100% rename from modules/operational-insights/workspace/linked-storage-accounts/version.json rename to modules/operational-insights/workspace/linked-storage-account/version.json diff --git a/modules/operational-insights/workspace/saved-searches/README.md b/modules/operational-insights/workspace/saved-searche/README.md similarity index 100% rename from modules/operational-insights/workspace/saved-searches/README.md rename to modules/operational-insights/workspace/saved-searche/README.md diff --git a/modules/operational-insights/workspace/saved-searches/main.bicep b/modules/operational-insights/workspace/saved-searche/main.bicep similarity index 100% rename from modules/operational-insights/workspace/saved-searches/main.bicep rename to modules/operational-insights/workspace/saved-searche/main.bicep diff --git a/modules/operational-insights/workspace/saved-searches/main.json b/modules/operational-insights/workspace/saved-searche/main.json similarity index 100% rename from modules/operational-insights/workspace/saved-searches/main.json rename to modules/operational-insights/workspace/saved-searche/main.json diff --git a/modules/operational-insights/workspace/saved-searches/version.json b/modules/operational-insights/workspace/saved-searche/version.json similarity index 100% rename from modules/operational-insights/workspace/saved-searches/version.json rename to modules/operational-insights/workspace/saved-searche/version.json diff --git a/modules/operational-insights/workspace/storage-insight-configs/README.md b/modules/operational-insights/workspace/storage-insight-config/README.md similarity index 100% rename from modules/operational-insights/workspace/storage-insight-configs/README.md rename to modules/operational-insights/workspace/storage-insight-config/README.md diff --git a/modules/operational-insights/workspace/storage-insight-configs/main.bicep b/modules/operational-insights/workspace/storage-insight-config/main.bicep similarity index 100% rename from modules/operational-insights/workspace/storage-insight-configs/main.bicep rename to modules/operational-insights/workspace/storage-insight-config/main.bicep diff --git a/modules/operational-insights/workspace/storage-insight-configs/main.json b/modules/operational-insights/workspace/storage-insight-config/main.json similarity index 100% rename from modules/operational-insights/workspace/storage-insight-configs/main.json rename to modules/operational-insights/workspace/storage-insight-config/main.json diff --git a/modules/operational-insights/workspace/storage-insight-configs/version.json b/modules/operational-insights/workspace/storage-insight-config/version.json similarity index 100% rename from modules/operational-insights/workspace/storage-insight-configs/version.json rename to modules/operational-insights/workspace/storage-insight-config/version.json diff --git a/modules/operational-insights/workspace/tables/README.md b/modules/operational-insights/workspace/table/README.md similarity index 100% rename from modules/operational-insights/workspace/tables/README.md rename to modules/operational-insights/workspace/table/README.md diff --git a/modules/operational-insights/workspace/tables/main.bicep b/modules/operational-insights/workspace/table/main.bicep similarity index 100% rename from modules/operational-insights/workspace/tables/main.bicep rename to modules/operational-insights/workspace/table/main.bicep diff --git a/modules/operational-insights/workspace/tables/main.json b/modules/operational-insights/workspace/table/main.json similarity index 100% rename from modules/operational-insights/workspace/tables/main.json rename to modules/operational-insights/workspace/table/main.json diff --git a/modules/operational-insights/workspace/tables/version.json b/modules/operational-insights/workspace/table/version.json similarity index 100% rename from modules/operational-insights/workspace/tables/version.json rename to modules/operational-insights/workspace/table/version.json diff --git a/modules/recovery-services/vault/backup-fabrics/protection-containers/README.md b/modules/recovery-services/vault/backup-fabrics/protection-container/README.md similarity index 100% rename from modules/recovery-services/vault/backup-fabrics/protection-containers/README.md rename to modules/recovery-services/vault/backup-fabrics/protection-container/README.md diff --git a/modules/recovery-services/vault/backup-fabrics/protection-containers/main.bicep b/modules/recovery-services/vault/backup-fabrics/protection-container/main.bicep similarity index 100% rename from modules/recovery-services/vault/backup-fabrics/protection-containers/main.bicep rename to modules/recovery-services/vault/backup-fabrics/protection-container/main.bicep diff --git a/modules/recovery-services/vault/backup-fabrics/protection-containers/main.json b/modules/recovery-services/vault/backup-fabrics/protection-container/main.json similarity index 100% rename from modules/recovery-services/vault/backup-fabrics/protection-containers/main.json rename to modules/recovery-services/vault/backup-fabrics/protection-container/main.json diff --git a/modules/recovery-services/vault/backup-fabrics/protection-containers/protected-items/README.md b/modules/recovery-services/vault/backup-fabrics/protection-container/protected-items/README.md similarity index 100% rename from modules/recovery-services/vault/backup-fabrics/protection-containers/protected-items/README.md rename to modules/recovery-services/vault/backup-fabrics/protection-container/protected-items/README.md diff --git a/modules/recovery-services/vault/backup-fabrics/protection-containers/protected-items/main.bicep b/modules/recovery-services/vault/backup-fabrics/protection-container/protected-items/main.bicep similarity index 100% rename from modules/recovery-services/vault/backup-fabrics/protection-containers/protected-items/main.bicep rename to modules/recovery-services/vault/backup-fabrics/protection-container/protected-items/main.bicep diff --git a/modules/recovery-services/vault/backup-fabrics/protection-containers/protected-items/main.json b/modules/recovery-services/vault/backup-fabrics/protection-container/protected-items/main.json similarity index 100% rename from modules/recovery-services/vault/backup-fabrics/protection-containers/protected-items/main.json rename to modules/recovery-services/vault/backup-fabrics/protection-container/protected-items/main.json diff --git a/modules/recovery-services/vault/backup-fabrics/protection-containers/protected-items/version.json b/modules/recovery-services/vault/backup-fabrics/protection-container/protected-items/version.json similarity index 100% rename from modules/recovery-services/vault/backup-fabrics/protection-containers/protected-items/version.json rename to modules/recovery-services/vault/backup-fabrics/protection-container/protected-items/version.json diff --git a/modules/recovery-services/vault/backup-fabrics/protection-containers/version.json b/modules/recovery-services/vault/backup-fabrics/protection-container/version.json similarity index 100% rename from modules/recovery-services/vault/backup-fabrics/protection-containers/version.json rename to modules/recovery-services/vault/backup-fabrics/protection-container/version.json diff --git a/modules/recovery-services/vault/backup-policies/README.md b/modules/recovery-services/vault/backup-policy/README.md similarity index 100% rename from modules/recovery-services/vault/backup-policies/README.md rename to modules/recovery-services/vault/backup-policy/README.md diff --git a/modules/recovery-services/vault/backup-policies/main.bicep b/modules/recovery-services/vault/backup-policy/main.bicep similarity index 100% rename from modules/recovery-services/vault/backup-policies/main.bicep rename to modules/recovery-services/vault/backup-policy/main.bicep diff --git a/modules/recovery-services/vault/backup-policies/main.json b/modules/recovery-services/vault/backup-policy/main.json similarity index 100% rename from modules/recovery-services/vault/backup-policies/main.json rename to modules/recovery-services/vault/backup-policy/main.json diff --git a/modules/recovery-services/vault/backup-policies/version.json b/modules/recovery-services/vault/backup-policy/version.json similarity index 100% rename from modules/recovery-services/vault/backup-policies/version.json rename to modules/recovery-services/vault/backup-policy/version.json diff --git a/modules/recovery-services/vault/replication-alert-settings/README.md b/modules/recovery-services/vault/replication-alert-setting/README.md similarity index 100% rename from modules/recovery-services/vault/replication-alert-settings/README.md rename to modules/recovery-services/vault/replication-alert-setting/README.md diff --git a/modules/recovery-services/vault/replication-alert-settings/main.bicep b/modules/recovery-services/vault/replication-alert-setting/main.bicep similarity index 100% rename from modules/recovery-services/vault/replication-alert-settings/main.bicep rename to modules/recovery-services/vault/replication-alert-setting/main.bicep diff --git a/modules/recovery-services/vault/replication-alert-settings/main.json b/modules/recovery-services/vault/replication-alert-setting/main.json similarity index 100% rename from modules/recovery-services/vault/replication-alert-settings/main.json rename to modules/recovery-services/vault/replication-alert-setting/main.json diff --git a/modules/recovery-services/vault/replication-alert-settings/version.json b/modules/recovery-services/vault/replication-alert-setting/version.json similarity index 100% rename from modules/recovery-services/vault/replication-alert-settings/version.json rename to modules/recovery-services/vault/replication-alert-setting/version.json diff --git a/modules/recovery-services/vault/replication-fabrics/README.md b/modules/recovery-services/vault/replication-fabric/README.md similarity index 100% rename from modules/recovery-services/vault/replication-fabrics/README.md rename to modules/recovery-services/vault/replication-fabric/README.md diff --git a/modules/recovery-services/vault/replication-fabrics/main.bicep b/modules/recovery-services/vault/replication-fabric/main.bicep similarity index 100% rename from modules/recovery-services/vault/replication-fabrics/main.bicep rename to modules/recovery-services/vault/replication-fabric/main.bicep diff --git a/modules/recovery-services/vault/replication-fabrics/main.json b/modules/recovery-services/vault/replication-fabric/main.json similarity index 100% rename from modules/recovery-services/vault/replication-fabrics/main.json rename to modules/recovery-services/vault/replication-fabric/main.json diff --git a/modules/recovery-services/vault/replication-fabrics/replication-protection-containers/README.md b/modules/recovery-services/vault/replication-fabric/replication-protection-containers/README.md similarity index 100% rename from modules/recovery-services/vault/replication-fabrics/replication-protection-containers/README.md rename to modules/recovery-services/vault/replication-fabric/replication-protection-containers/README.md diff --git a/modules/recovery-services/vault/replication-fabrics/replication-protection-containers/main.bicep b/modules/recovery-services/vault/replication-fabric/replication-protection-containers/main.bicep similarity index 100% rename from modules/recovery-services/vault/replication-fabrics/replication-protection-containers/main.bicep rename to modules/recovery-services/vault/replication-fabric/replication-protection-containers/main.bicep diff --git a/modules/recovery-services/vault/replication-fabrics/replication-protection-containers/main.json b/modules/recovery-services/vault/replication-fabric/replication-protection-containers/main.json similarity index 100% rename from modules/recovery-services/vault/replication-fabrics/replication-protection-containers/main.json rename to modules/recovery-services/vault/replication-fabric/replication-protection-containers/main.json diff --git a/modules/recovery-services/vault/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/README.md b/modules/recovery-services/vault/replication-fabric/replication-protection-containers/replication-protection-container-mappings/README.md similarity index 100% rename from modules/recovery-services/vault/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/README.md rename to modules/recovery-services/vault/replication-fabric/replication-protection-containers/replication-protection-container-mappings/README.md diff --git a/modules/recovery-services/vault/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/main.bicep b/modules/recovery-services/vault/replication-fabric/replication-protection-containers/replication-protection-container-mappings/main.bicep similarity index 100% rename from modules/recovery-services/vault/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/main.bicep rename to modules/recovery-services/vault/replication-fabric/replication-protection-containers/replication-protection-container-mappings/main.bicep diff --git a/modules/recovery-services/vault/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/main.json b/modules/recovery-services/vault/replication-fabric/replication-protection-containers/replication-protection-container-mappings/main.json similarity index 100% rename from modules/recovery-services/vault/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/main.json rename to modules/recovery-services/vault/replication-fabric/replication-protection-containers/replication-protection-container-mappings/main.json diff --git a/modules/recovery-services/vault/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/version.json b/modules/recovery-services/vault/replication-fabric/replication-protection-containers/replication-protection-container-mappings/version.json similarity index 100% rename from modules/recovery-services/vault/replication-fabrics/replication-protection-containers/replication-protection-container-mappings/version.json rename to modules/recovery-services/vault/replication-fabric/replication-protection-containers/replication-protection-container-mappings/version.json diff --git a/modules/recovery-services/vault/replication-fabrics/replication-protection-containers/version.json b/modules/recovery-services/vault/replication-fabric/replication-protection-containers/version.json similarity index 100% rename from modules/recovery-services/vault/replication-fabrics/replication-protection-containers/version.json rename to modules/recovery-services/vault/replication-fabric/replication-protection-containers/version.json diff --git a/modules/recovery-services/vault/replication-fabrics/version.json b/modules/recovery-services/vault/replication-fabric/version.json similarity index 100% rename from modules/recovery-services/vault/replication-fabrics/version.json rename to modules/recovery-services/vault/replication-fabric/version.json diff --git a/modules/recovery-services/vault/replication-policies/README.md b/modules/recovery-services/vault/replication-policy/README.md similarity index 100% rename from modules/recovery-services/vault/replication-policies/README.md rename to modules/recovery-services/vault/replication-policy/README.md diff --git a/modules/recovery-services/vault/replication-policies/main.bicep b/modules/recovery-services/vault/replication-policy/main.bicep similarity index 100% rename from modules/recovery-services/vault/replication-policies/main.bicep rename to modules/recovery-services/vault/replication-policy/main.bicep diff --git a/modules/recovery-services/vault/replication-policies/main.json b/modules/recovery-services/vault/replication-policy/main.json similarity index 100% rename from modules/recovery-services/vault/replication-policies/main.json rename to modules/recovery-services/vault/replication-policy/main.json diff --git a/modules/recovery-services/vault/replication-policies/version.json b/modules/recovery-services/vault/replication-policy/version.json similarity index 100% rename from modules/recovery-services/vault/replication-policies/version.json rename to modules/recovery-services/vault/replication-policy/version.json diff --git a/modules/relay/namespace/authorization-rules/README.md b/modules/relay/namespace/authorization-rule/README.md similarity index 100% rename from modules/relay/namespace/authorization-rules/README.md rename to modules/relay/namespace/authorization-rule/README.md diff --git a/modules/relay/namespace/authorization-rules/main.bicep b/modules/relay/namespace/authorization-rule/main.bicep similarity index 100% rename from modules/relay/namespace/authorization-rules/main.bicep rename to modules/relay/namespace/authorization-rule/main.bicep diff --git a/modules/relay/namespace/authorization-rules/main.json b/modules/relay/namespace/authorization-rule/main.json similarity index 100% rename from modules/relay/namespace/authorization-rules/main.json rename to modules/relay/namespace/authorization-rule/main.json diff --git a/modules/relay/namespace/authorization-rules/version.json b/modules/relay/namespace/authorization-rule/version.json similarity index 100% rename from modules/relay/namespace/authorization-rules/version.json rename to modules/relay/namespace/authorization-rule/version.json diff --git a/modules/relay/namespace/hybrid-connections/.bicep/nested_roleAssignments.bicep b/modules/relay/namespace/hybrid-connection/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/relay/namespace/hybrid-connections/.bicep/nested_roleAssignments.bicep rename to modules/relay/namespace/hybrid-connection/.bicep/nested_roleAssignments.bicep diff --git a/modules/relay/namespace/hybrid-connections/README.md b/modules/relay/namespace/hybrid-connection/README.md similarity index 100% rename from modules/relay/namespace/hybrid-connections/README.md rename to modules/relay/namespace/hybrid-connection/README.md diff --git a/modules/relay/namespace/hybrid-connections/authorization-rules/README.md b/modules/relay/namespace/hybrid-connection/authorization-rules/README.md similarity index 100% rename from modules/relay/namespace/hybrid-connections/authorization-rules/README.md rename to modules/relay/namespace/hybrid-connection/authorization-rules/README.md diff --git a/modules/relay/namespace/hybrid-connections/authorization-rules/main.bicep b/modules/relay/namespace/hybrid-connection/authorization-rules/main.bicep similarity index 100% rename from modules/relay/namespace/hybrid-connections/authorization-rules/main.bicep rename to modules/relay/namespace/hybrid-connection/authorization-rules/main.bicep diff --git a/modules/relay/namespace/hybrid-connections/authorization-rules/main.json b/modules/relay/namespace/hybrid-connection/authorization-rules/main.json similarity index 100% rename from modules/relay/namespace/hybrid-connections/authorization-rules/main.json rename to modules/relay/namespace/hybrid-connection/authorization-rules/main.json diff --git a/modules/relay/namespace/hybrid-connections/authorization-rules/version.json b/modules/relay/namespace/hybrid-connection/authorization-rules/version.json similarity index 100% rename from modules/relay/namespace/hybrid-connections/authorization-rules/version.json rename to modules/relay/namespace/hybrid-connection/authorization-rules/version.json diff --git a/modules/relay/namespace/hybrid-connections/main.bicep b/modules/relay/namespace/hybrid-connection/main.bicep similarity index 100% rename from modules/relay/namespace/hybrid-connections/main.bicep rename to modules/relay/namespace/hybrid-connection/main.bicep diff --git a/modules/relay/namespace/hybrid-connections/main.json b/modules/relay/namespace/hybrid-connection/main.json similarity index 100% rename from modules/relay/namespace/hybrid-connections/main.json rename to modules/relay/namespace/hybrid-connection/main.json diff --git a/modules/relay/namespace/hybrid-connections/version.json b/modules/relay/namespace/hybrid-connection/version.json similarity index 100% rename from modules/relay/namespace/hybrid-connections/version.json rename to modules/relay/namespace/hybrid-connection/version.json diff --git a/modules/relay/namespace/network-rule-sets/README.md b/modules/relay/namespace/network-rule-set/README.md similarity index 100% rename from modules/relay/namespace/network-rule-sets/README.md rename to modules/relay/namespace/network-rule-set/README.md diff --git a/modules/relay/namespace/network-rule-sets/main.bicep b/modules/relay/namespace/network-rule-set/main.bicep similarity index 100% rename from modules/relay/namespace/network-rule-sets/main.bicep rename to modules/relay/namespace/network-rule-set/main.bicep diff --git a/modules/relay/namespace/network-rule-sets/main.json b/modules/relay/namespace/network-rule-set/main.json similarity index 100% rename from modules/relay/namespace/network-rule-sets/main.json rename to modules/relay/namespace/network-rule-set/main.json diff --git a/modules/relay/namespace/network-rule-sets/version.json b/modules/relay/namespace/network-rule-set/version.json similarity index 100% rename from modules/relay/namespace/network-rule-sets/version.json rename to modules/relay/namespace/network-rule-set/version.json diff --git a/modules/relay/namespace/wcf-relays/.bicep/nested_roleAssignments.bicep b/modules/relay/namespace/wcf-relay/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/relay/namespace/wcf-relays/.bicep/nested_roleAssignments.bicep rename to modules/relay/namespace/wcf-relay/.bicep/nested_roleAssignments.bicep diff --git a/modules/relay/namespace/wcf-relays/README.md b/modules/relay/namespace/wcf-relay/README.md similarity index 100% rename from modules/relay/namespace/wcf-relays/README.md rename to modules/relay/namespace/wcf-relay/README.md diff --git a/modules/relay/namespace/wcf-relays/authorization-rules/README.md b/modules/relay/namespace/wcf-relay/authorization-rules/README.md similarity index 100% rename from modules/relay/namespace/wcf-relays/authorization-rules/README.md rename to modules/relay/namespace/wcf-relay/authorization-rules/README.md diff --git a/modules/relay/namespace/wcf-relays/authorization-rules/main.bicep b/modules/relay/namespace/wcf-relay/authorization-rules/main.bicep similarity index 100% rename from modules/relay/namespace/wcf-relays/authorization-rules/main.bicep rename to modules/relay/namespace/wcf-relay/authorization-rules/main.bicep diff --git a/modules/relay/namespace/wcf-relays/authorization-rules/main.json b/modules/relay/namespace/wcf-relay/authorization-rules/main.json similarity index 100% rename from modules/relay/namespace/wcf-relays/authorization-rules/main.json rename to modules/relay/namespace/wcf-relay/authorization-rules/main.json diff --git a/modules/relay/namespace/wcf-relays/authorization-rules/version.json b/modules/relay/namespace/wcf-relay/authorization-rules/version.json similarity index 100% rename from modules/relay/namespace/wcf-relays/authorization-rules/version.json rename to modules/relay/namespace/wcf-relay/authorization-rules/version.json diff --git a/modules/relay/namespace/wcf-relays/main.bicep b/modules/relay/namespace/wcf-relay/main.bicep similarity index 100% rename from modules/relay/namespace/wcf-relays/main.bicep rename to modules/relay/namespace/wcf-relay/main.bicep diff --git a/modules/relay/namespace/wcf-relays/main.json b/modules/relay/namespace/wcf-relay/main.json similarity index 100% rename from modules/relay/namespace/wcf-relays/main.json rename to modules/relay/namespace/wcf-relay/main.json diff --git a/modules/relay/namespace/wcf-relays/version.json b/modules/relay/namespace/wcf-relay/version.json similarity index 100% rename from modules/relay/namespace/wcf-relays/version.json rename to modules/relay/namespace/wcf-relay/version.json diff --git a/modules/service-bus/namespace/authorization-rules/README.md b/modules/service-bus/namespace/authorization-rule/README.md similarity index 100% rename from modules/service-bus/namespace/authorization-rules/README.md rename to modules/service-bus/namespace/authorization-rule/README.md diff --git a/modules/service-bus/namespace/authorization-rules/main.bicep b/modules/service-bus/namespace/authorization-rule/main.bicep similarity index 100% rename from modules/service-bus/namespace/authorization-rules/main.bicep rename to modules/service-bus/namespace/authorization-rule/main.bicep diff --git a/modules/service-bus/namespace/authorization-rules/main.json b/modules/service-bus/namespace/authorization-rule/main.json similarity index 100% rename from modules/service-bus/namespace/authorization-rules/main.json rename to modules/service-bus/namespace/authorization-rule/main.json diff --git a/modules/service-bus/namespace/authorization-rules/version.json b/modules/service-bus/namespace/authorization-rule/version.json similarity index 100% rename from modules/service-bus/namespace/authorization-rules/version.json rename to modules/service-bus/namespace/authorization-rule/version.json diff --git a/modules/service-bus/namespace/disaster-recovery-configs/README.md b/modules/service-bus/namespace/disaster-recovery-config/README.md similarity index 100% rename from modules/service-bus/namespace/disaster-recovery-configs/README.md rename to modules/service-bus/namespace/disaster-recovery-config/README.md diff --git a/modules/service-bus/namespace/disaster-recovery-configs/main.bicep b/modules/service-bus/namespace/disaster-recovery-config/main.bicep similarity index 100% rename from modules/service-bus/namespace/disaster-recovery-configs/main.bicep rename to modules/service-bus/namespace/disaster-recovery-config/main.bicep diff --git a/modules/service-bus/namespace/disaster-recovery-configs/main.json b/modules/service-bus/namespace/disaster-recovery-config/main.json similarity index 100% rename from modules/service-bus/namespace/disaster-recovery-configs/main.json rename to modules/service-bus/namespace/disaster-recovery-config/main.json diff --git a/modules/service-bus/namespace/disaster-recovery-configs/version.json b/modules/service-bus/namespace/disaster-recovery-config/version.json similarity index 100% rename from modules/service-bus/namespace/disaster-recovery-configs/version.json rename to modules/service-bus/namespace/disaster-recovery-config/version.json diff --git a/modules/service-bus/namespace/migration-configurations/README.md b/modules/service-bus/namespace/migration-configuration/README.md similarity index 100% rename from modules/service-bus/namespace/migration-configurations/README.md rename to modules/service-bus/namespace/migration-configuration/README.md diff --git a/modules/service-bus/namespace/migration-configurations/main.bicep b/modules/service-bus/namespace/migration-configuration/main.bicep similarity index 100% rename from modules/service-bus/namespace/migration-configurations/main.bicep rename to modules/service-bus/namespace/migration-configuration/main.bicep diff --git a/modules/service-bus/namespace/migration-configurations/main.json b/modules/service-bus/namespace/migration-configuration/main.json similarity index 100% rename from modules/service-bus/namespace/migration-configurations/main.json rename to modules/service-bus/namespace/migration-configuration/main.json diff --git a/modules/service-bus/namespace/migration-configurations/version.json b/modules/service-bus/namespace/migration-configuration/version.json similarity index 100% rename from modules/service-bus/namespace/migration-configurations/version.json rename to modules/service-bus/namespace/migration-configuration/version.json diff --git a/modules/service-bus/namespace/network-rule-sets/README.md b/modules/service-bus/namespace/network-rule-set/README.md similarity index 100% rename from modules/service-bus/namespace/network-rule-sets/README.md rename to modules/service-bus/namespace/network-rule-set/README.md diff --git a/modules/service-bus/namespace/network-rule-sets/main.bicep b/modules/service-bus/namespace/network-rule-set/main.bicep similarity index 100% rename from modules/service-bus/namespace/network-rule-sets/main.bicep rename to modules/service-bus/namespace/network-rule-set/main.bicep diff --git a/modules/service-bus/namespace/network-rule-sets/main.json b/modules/service-bus/namespace/network-rule-set/main.json similarity index 100% rename from modules/service-bus/namespace/network-rule-sets/main.json rename to modules/service-bus/namespace/network-rule-set/main.json diff --git a/modules/service-bus/namespace/network-rule-sets/version.json b/modules/service-bus/namespace/network-rule-set/version.json similarity index 100% rename from modules/service-bus/namespace/network-rule-sets/version.json rename to modules/service-bus/namespace/network-rule-set/version.json diff --git a/modules/service-bus/namespace/queues/.bicep/nested_roleAssignments.bicep b/modules/service-bus/namespace/queue/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/service-bus/namespace/queues/.bicep/nested_roleAssignments.bicep rename to modules/service-bus/namespace/queue/.bicep/nested_roleAssignments.bicep diff --git a/modules/service-bus/namespace/queues/README.md b/modules/service-bus/namespace/queue/README.md similarity index 100% rename from modules/service-bus/namespace/queues/README.md rename to modules/service-bus/namespace/queue/README.md diff --git a/modules/service-bus/namespace/queues/authorization-rules/README.md b/modules/service-bus/namespace/queue/authorization-rules/README.md similarity index 100% rename from modules/service-bus/namespace/queues/authorization-rules/README.md rename to modules/service-bus/namespace/queue/authorization-rules/README.md diff --git a/modules/service-bus/namespace/queues/authorization-rules/main.bicep b/modules/service-bus/namespace/queue/authorization-rules/main.bicep similarity index 100% rename from modules/service-bus/namespace/queues/authorization-rules/main.bicep rename to modules/service-bus/namespace/queue/authorization-rules/main.bicep diff --git a/modules/service-bus/namespace/queues/authorization-rules/main.json b/modules/service-bus/namespace/queue/authorization-rules/main.json similarity index 100% rename from modules/service-bus/namespace/queues/authorization-rules/main.json rename to modules/service-bus/namespace/queue/authorization-rules/main.json diff --git a/modules/service-bus/namespace/queues/authorization-rules/version.json b/modules/service-bus/namespace/queue/authorization-rules/version.json similarity index 100% rename from modules/service-bus/namespace/queues/authorization-rules/version.json rename to modules/service-bus/namespace/queue/authorization-rules/version.json diff --git a/modules/service-bus/namespace/queues/main.bicep b/modules/service-bus/namespace/queue/main.bicep similarity index 100% rename from modules/service-bus/namespace/queues/main.bicep rename to modules/service-bus/namespace/queue/main.bicep diff --git a/modules/service-bus/namespace/queues/main.json b/modules/service-bus/namespace/queue/main.json similarity index 100% rename from modules/service-bus/namespace/queues/main.json rename to modules/service-bus/namespace/queue/main.json diff --git a/modules/service-bus/namespace/queues/version.json b/modules/service-bus/namespace/queue/version.json similarity index 100% rename from modules/service-bus/namespace/queues/version.json rename to modules/service-bus/namespace/queue/version.json diff --git a/modules/service-bus/namespace/topics/.bicep/nested_roleAssignments.bicep b/modules/service-bus/namespace/topic/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/service-bus/namespace/topics/.bicep/nested_roleAssignments.bicep rename to modules/service-bus/namespace/topic/.bicep/nested_roleAssignments.bicep diff --git a/modules/service-bus/namespace/topics/README.md b/modules/service-bus/namespace/topic/README.md similarity index 100% rename from modules/service-bus/namespace/topics/README.md rename to modules/service-bus/namespace/topic/README.md diff --git a/modules/service-bus/namespace/topics/authorization-rules/README.md b/modules/service-bus/namespace/topic/authorization-rules/README.md similarity index 100% rename from modules/service-bus/namespace/topics/authorization-rules/README.md rename to modules/service-bus/namespace/topic/authorization-rules/README.md diff --git a/modules/service-bus/namespace/topics/authorization-rules/main.bicep b/modules/service-bus/namespace/topic/authorization-rules/main.bicep similarity index 100% rename from modules/service-bus/namespace/topics/authorization-rules/main.bicep rename to modules/service-bus/namespace/topic/authorization-rules/main.bicep diff --git a/modules/service-bus/namespace/topics/authorization-rules/main.json b/modules/service-bus/namespace/topic/authorization-rules/main.json similarity index 100% rename from modules/service-bus/namespace/topics/authorization-rules/main.json rename to modules/service-bus/namespace/topic/authorization-rules/main.json diff --git a/modules/service-bus/namespace/topics/authorization-rules/version.json b/modules/service-bus/namespace/topic/authorization-rules/version.json similarity index 100% rename from modules/service-bus/namespace/topics/authorization-rules/version.json rename to modules/service-bus/namespace/topic/authorization-rules/version.json diff --git a/modules/service-bus/namespace/topics/main.bicep b/modules/service-bus/namespace/topic/main.bicep similarity index 100% rename from modules/service-bus/namespace/topics/main.bicep rename to modules/service-bus/namespace/topic/main.bicep diff --git a/modules/service-bus/namespace/topics/main.json b/modules/service-bus/namespace/topic/main.json similarity index 100% rename from modules/service-bus/namespace/topics/main.json rename to modules/service-bus/namespace/topic/main.json diff --git a/modules/service-bus/namespace/topics/version.json b/modules/service-bus/namespace/topic/version.json similarity index 100% rename from modules/service-bus/namespace/topics/version.json rename to modules/service-bus/namespace/topic/version.json diff --git a/modules/service-fabric/cluster/application-types/README.md b/modules/service-fabric/cluster/application-type/README.md similarity index 100% rename from modules/service-fabric/cluster/application-types/README.md rename to modules/service-fabric/cluster/application-type/README.md diff --git a/modules/service-fabric/cluster/application-types/main.bicep b/modules/service-fabric/cluster/application-type/main.bicep similarity index 100% rename from modules/service-fabric/cluster/application-types/main.bicep rename to modules/service-fabric/cluster/application-type/main.bicep diff --git a/modules/service-fabric/cluster/application-types/main.json b/modules/service-fabric/cluster/application-type/main.json similarity index 100% rename from modules/service-fabric/cluster/application-types/main.json rename to modules/service-fabric/cluster/application-type/main.json diff --git a/modules/service-fabric/cluster/application-types/version.json b/modules/service-fabric/cluster/application-type/version.json similarity index 100% rename from modules/service-fabric/cluster/application-types/version.json rename to modules/service-fabric/cluster/application-type/version.json diff --git a/modules/sql/managed-instance/administrators/README.md b/modules/sql/managed-instance/administrator/README.md similarity index 100% rename from modules/sql/managed-instance/administrators/README.md rename to modules/sql/managed-instance/administrator/README.md diff --git a/modules/sql/managed-instance/administrators/main.bicep b/modules/sql/managed-instance/administrator/main.bicep similarity index 100% rename from modules/sql/managed-instance/administrators/main.bicep rename to modules/sql/managed-instance/administrator/main.bicep diff --git a/modules/sql/managed-instance/administrators/main.json b/modules/sql/managed-instance/administrator/main.json similarity index 100% rename from modules/sql/managed-instance/administrators/main.json rename to modules/sql/managed-instance/administrator/main.json diff --git a/modules/sql/managed-instance/administrators/version.json b/modules/sql/managed-instance/administrator/version.json similarity index 100% rename from modules/sql/managed-instance/administrators/version.json rename to modules/sql/managed-instance/administrator/version.json diff --git a/modules/sql/managed-instance/databases/README.md b/modules/sql/managed-instance/database/README.md similarity index 100% rename from modules/sql/managed-instance/databases/README.md rename to modules/sql/managed-instance/database/README.md diff --git a/modules/sql/managed-instance/databases/backup-long-term-retention-policies/README.md b/modules/sql/managed-instance/database/backup-long-term-retention-policies/README.md similarity index 100% rename from modules/sql/managed-instance/databases/backup-long-term-retention-policies/README.md rename to modules/sql/managed-instance/database/backup-long-term-retention-policies/README.md diff --git a/modules/sql/managed-instance/databases/backup-long-term-retention-policies/main.bicep b/modules/sql/managed-instance/database/backup-long-term-retention-policies/main.bicep similarity index 100% rename from modules/sql/managed-instance/databases/backup-long-term-retention-policies/main.bicep rename to modules/sql/managed-instance/database/backup-long-term-retention-policies/main.bicep diff --git a/modules/sql/managed-instance/databases/backup-long-term-retention-policies/main.json b/modules/sql/managed-instance/database/backup-long-term-retention-policies/main.json similarity index 100% rename from modules/sql/managed-instance/databases/backup-long-term-retention-policies/main.json rename to modules/sql/managed-instance/database/backup-long-term-retention-policies/main.json diff --git a/modules/sql/managed-instance/databases/backup-long-term-retention-policies/version.json b/modules/sql/managed-instance/database/backup-long-term-retention-policies/version.json similarity index 100% rename from modules/sql/managed-instance/databases/backup-long-term-retention-policies/version.json rename to modules/sql/managed-instance/database/backup-long-term-retention-policies/version.json diff --git a/modules/sql/managed-instance/databases/backup-short-term-retention-policies/README.md b/modules/sql/managed-instance/database/backup-short-term-retention-policies/README.md similarity index 100% rename from modules/sql/managed-instance/databases/backup-short-term-retention-policies/README.md rename to modules/sql/managed-instance/database/backup-short-term-retention-policies/README.md diff --git a/modules/sql/managed-instance/databases/backup-short-term-retention-policies/main.bicep b/modules/sql/managed-instance/database/backup-short-term-retention-policies/main.bicep similarity index 100% rename from modules/sql/managed-instance/databases/backup-short-term-retention-policies/main.bicep rename to modules/sql/managed-instance/database/backup-short-term-retention-policies/main.bicep diff --git a/modules/sql/managed-instance/databases/backup-short-term-retention-policies/main.json b/modules/sql/managed-instance/database/backup-short-term-retention-policies/main.json similarity index 100% rename from modules/sql/managed-instance/databases/backup-short-term-retention-policies/main.json rename to modules/sql/managed-instance/database/backup-short-term-retention-policies/main.json diff --git a/modules/sql/managed-instance/databases/backup-short-term-retention-policies/version.json b/modules/sql/managed-instance/database/backup-short-term-retention-policies/version.json similarity index 100% rename from modules/sql/managed-instance/databases/backup-short-term-retention-policies/version.json rename to modules/sql/managed-instance/database/backup-short-term-retention-policies/version.json diff --git a/modules/sql/managed-instance/databases/main.bicep b/modules/sql/managed-instance/database/main.bicep similarity index 100% rename from modules/sql/managed-instance/databases/main.bicep rename to modules/sql/managed-instance/database/main.bicep diff --git a/modules/sql/managed-instance/databases/main.json b/modules/sql/managed-instance/database/main.json similarity index 100% rename from modules/sql/managed-instance/databases/main.json rename to modules/sql/managed-instance/database/main.json diff --git a/modules/sql/managed-instance/databases/version.json b/modules/sql/managed-instance/database/version.json similarity index 100% rename from modules/sql/managed-instance/databases/version.json rename to modules/sql/managed-instance/database/version.json diff --git a/modules/sql/managed-instance/keys/README.md b/modules/sql/managed-instance/key/README.md similarity index 100% rename from modules/sql/managed-instance/keys/README.md rename to modules/sql/managed-instance/key/README.md diff --git a/modules/sql/managed-instance/keys/main.bicep b/modules/sql/managed-instance/key/main.bicep similarity index 100% rename from modules/sql/managed-instance/keys/main.bicep rename to modules/sql/managed-instance/key/main.bicep diff --git a/modules/sql/managed-instance/keys/main.json b/modules/sql/managed-instance/key/main.json similarity index 100% rename from modules/sql/managed-instance/keys/main.json rename to modules/sql/managed-instance/key/main.json diff --git a/modules/sql/managed-instance/keys/version.json b/modules/sql/managed-instance/key/version.json similarity index 100% rename from modules/sql/managed-instance/keys/version.json rename to modules/sql/managed-instance/key/version.json diff --git a/modules/sql/managed-instance/security-alert-policies/README.md b/modules/sql/managed-instance/security-alert-policy/README.md similarity index 100% rename from modules/sql/managed-instance/security-alert-policies/README.md rename to modules/sql/managed-instance/security-alert-policy/README.md diff --git a/modules/sql/managed-instance/security-alert-policies/main.bicep b/modules/sql/managed-instance/security-alert-policy/main.bicep similarity index 100% rename from modules/sql/managed-instance/security-alert-policies/main.bicep rename to modules/sql/managed-instance/security-alert-policy/main.bicep diff --git a/modules/sql/managed-instance/security-alert-policies/main.json b/modules/sql/managed-instance/security-alert-policy/main.json similarity index 100% rename from modules/sql/managed-instance/security-alert-policies/main.json rename to modules/sql/managed-instance/security-alert-policy/main.json diff --git a/modules/sql/managed-instance/security-alert-policies/version.json b/modules/sql/managed-instance/security-alert-policy/version.json similarity index 100% rename from modules/sql/managed-instance/security-alert-policies/version.json rename to modules/sql/managed-instance/security-alert-policy/version.json diff --git a/modules/sql/managed-instance/vulnerability-assessments/README.md b/modules/sql/managed-instance/vulnerability-assessment/README.md similarity index 100% rename from modules/sql/managed-instance/vulnerability-assessments/README.md rename to modules/sql/managed-instance/vulnerability-assessment/README.md diff --git a/modules/sql/managed-instance/vulnerability-assessments/main.bicep b/modules/sql/managed-instance/vulnerability-assessment/main.bicep similarity index 100% rename from modules/sql/managed-instance/vulnerability-assessments/main.bicep rename to modules/sql/managed-instance/vulnerability-assessment/main.bicep diff --git a/modules/sql/managed-instance/vulnerability-assessments/main.json b/modules/sql/managed-instance/vulnerability-assessment/main.json similarity index 100% rename from modules/sql/managed-instance/vulnerability-assessments/main.json rename to modules/sql/managed-instance/vulnerability-assessment/main.json diff --git a/modules/sql/managed-instance/vulnerability-assessments/version.json b/modules/sql/managed-instance/vulnerability-assessment/version.json similarity index 100% rename from modules/sql/managed-instance/vulnerability-assessments/version.json rename to modules/sql/managed-instance/vulnerability-assessment/version.json diff --git a/modules/sql/server/databases/README.md b/modules/sql/server/database/README.md similarity index 100% rename from modules/sql/server/databases/README.md rename to modules/sql/server/database/README.md diff --git a/modules/sql/server/databases/backup-long-term-retention-policies/README.md b/modules/sql/server/database/backup-long-term-retention-policies/README.md similarity index 100% rename from modules/sql/server/databases/backup-long-term-retention-policies/README.md rename to modules/sql/server/database/backup-long-term-retention-policies/README.md diff --git a/modules/sql/server/databases/backup-long-term-retention-policies/main.bicep b/modules/sql/server/database/backup-long-term-retention-policies/main.bicep similarity index 100% rename from modules/sql/server/databases/backup-long-term-retention-policies/main.bicep rename to modules/sql/server/database/backup-long-term-retention-policies/main.bicep diff --git a/modules/sql/server/databases/backup-long-term-retention-policies/main.json b/modules/sql/server/database/backup-long-term-retention-policies/main.json similarity index 100% rename from modules/sql/server/databases/backup-long-term-retention-policies/main.json rename to modules/sql/server/database/backup-long-term-retention-policies/main.json diff --git a/modules/sql/server/databases/backup-long-term-retention-policies/version.json b/modules/sql/server/database/backup-long-term-retention-policies/version.json similarity index 100% rename from modules/sql/server/databases/backup-long-term-retention-policies/version.json rename to modules/sql/server/database/backup-long-term-retention-policies/version.json diff --git a/modules/sql/server/databases/backup-short-term-retention-policies/README.md b/modules/sql/server/database/backup-short-term-retention-policies/README.md similarity index 100% rename from modules/sql/server/databases/backup-short-term-retention-policies/README.md rename to modules/sql/server/database/backup-short-term-retention-policies/README.md diff --git a/modules/sql/server/databases/backup-short-term-retention-policies/main.bicep b/modules/sql/server/database/backup-short-term-retention-policies/main.bicep similarity index 100% rename from modules/sql/server/databases/backup-short-term-retention-policies/main.bicep rename to modules/sql/server/database/backup-short-term-retention-policies/main.bicep diff --git a/modules/sql/server/databases/backup-short-term-retention-policies/main.json b/modules/sql/server/database/backup-short-term-retention-policies/main.json similarity index 100% rename from modules/sql/server/databases/backup-short-term-retention-policies/main.json rename to modules/sql/server/database/backup-short-term-retention-policies/main.json diff --git a/modules/sql/server/databases/backup-short-term-retention-policies/version.json b/modules/sql/server/database/backup-short-term-retention-policies/version.json similarity index 100% rename from modules/sql/server/databases/backup-short-term-retention-policies/version.json rename to modules/sql/server/database/backup-short-term-retention-policies/version.json diff --git a/modules/sql/server/databases/main.bicep b/modules/sql/server/database/main.bicep similarity index 100% rename from modules/sql/server/databases/main.bicep rename to modules/sql/server/database/main.bicep diff --git a/modules/sql/server/databases/main.json b/modules/sql/server/database/main.json similarity index 100% rename from modules/sql/server/databases/main.json rename to modules/sql/server/database/main.json diff --git a/modules/sql/server/databases/version.json b/modules/sql/server/database/version.json similarity index 100% rename from modules/sql/server/databases/version.json rename to modules/sql/server/database/version.json diff --git a/modules/sql/server/elastic-pools/README.md b/modules/sql/server/elastic-pool/README.md similarity index 100% rename from modules/sql/server/elastic-pools/README.md rename to modules/sql/server/elastic-pool/README.md diff --git a/modules/sql/server/elastic-pools/main.bicep b/modules/sql/server/elastic-pool/main.bicep similarity index 100% rename from modules/sql/server/elastic-pools/main.bicep rename to modules/sql/server/elastic-pool/main.bicep diff --git a/modules/sql/server/elastic-pools/main.json b/modules/sql/server/elastic-pool/main.json similarity index 100% rename from modules/sql/server/elastic-pools/main.json rename to modules/sql/server/elastic-pool/main.json diff --git a/modules/sql/server/elastic-pools/version.json b/modules/sql/server/elastic-pool/version.json similarity index 100% rename from modules/sql/server/elastic-pools/version.json rename to modules/sql/server/elastic-pool/version.json diff --git a/modules/sql/server/firewall-rules/README.md b/modules/sql/server/firewall-rule/README.md similarity index 100% rename from modules/sql/server/firewall-rules/README.md rename to modules/sql/server/firewall-rule/README.md diff --git a/modules/sql/server/firewall-rules/main.bicep b/modules/sql/server/firewall-rule/main.bicep similarity index 100% rename from modules/sql/server/firewall-rules/main.bicep rename to modules/sql/server/firewall-rule/main.bicep diff --git a/modules/sql/server/firewall-rules/main.json b/modules/sql/server/firewall-rule/main.json similarity index 100% rename from modules/sql/server/firewall-rules/main.json rename to modules/sql/server/firewall-rule/main.json diff --git a/modules/sql/server/firewall-rules/version.json b/modules/sql/server/firewall-rule/version.json similarity index 100% rename from modules/sql/server/firewall-rules/version.json rename to modules/sql/server/firewall-rule/version.json diff --git a/modules/sql/server/keys/README.md b/modules/sql/server/key/README.md similarity index 100% rename from modules/sql/server/keys/README.md rename to modules/sql/server/key/README.md diff --git a/modules/sql/server/keys/main.bicep b/modules/sql/server/key/main.bicep similarity index 100% rename from modules/sql/server/keys/main.bicep rename to modules/sql/server/key/main.bicep diff --git a/modules/sql/server/keys/main.json b/modules/sql/server/key/main.json similarity index 100% rename from modules/sql/server/keys/main.json rename to modules/sql/server/key/main.json diff --git a/modules/sql/server/keys/version.json b/modules/sql/server/key/version.json similarity index 100% rename from modules/sql/server/keys/version.json rename to modules/sql/server/key/version.json diff --git a/modules/sql/server/security-alert-policies/README.md b/modules/sql/server/security-alert-policy/README.md similarity index 100% rename from modules/sql/server/security-alert-policies/README.md rename to modules/sql/server/security-alert-policy/README.md diff --git a/modules/sql/server/security-alert-policies/main.bicep b/modules/sql/server/security-alert-policy/main.bicep similarity index 100% rename from modules/sql/server/security-alert-policies/main.bicep rename to modules/sql/server/security-alert-policy/main.bicep diff --git a/modules/sql/server/security-alert-policies/main.json b/modules/sql/server/security-alert-policy/main.json similarity index 100% rename from modules/sql/server/security-alert-policies/main.json rename to modules/sql/server/security-alert-policy/main.json diff --git a/modules/sql/server/security-alert-policies/version.json b/modules/sql/server/security-alert-policy/version.json similarity index 100% rename from modules/sql/server/security-alert-policies/version.json rename to modules/sql/server/security-alert-policy/version.json diff --git a/modules/sql/server/virtual-network-rules/README.md b/modules/sql/server/virtual-network-rule/README.md similarity index 100% rename from modules/sql/server/virtual-network-rules/README.md rename to modules/sql/server/virtual-network-rule/README.md diff --git a/modules/sql/server/virtual-network-rules/main.bicep b/modules/sql/server/virtual-network-rule/main.bicep similarity index 100% rename from modules/sql/server/virtual-network-rules/main.bicep rename to modules/sql/server/virtual-network-rule/main.bicep diff --git a/modules/sql/server/virtual-network-rules/main.json b/modules/sql/server/virtual-network-rule/main.json similarity index 100% rename from modules/sql/server/virtual-network-rules/main.json rename to modules/sql/server/virtual-network-rule/main.json diff --git a/modules/sql/server/virtual-network-rules/version.json b/modules/sql/server/virtual-network-rule/version.json similarity index 100% rename from modules/sql/server/virtual-network-rules/version.json rename to modules/sql/server/virtual-network-rule/version.json diff --git a/modules/sql/server/vulnerability-assessments/README.md b/modules/sql/server/vulnerability-assessment/README.md similarity index 100% rename from modules/sql/server/vulnerability-assessments/README.md rename to modules/sql/server/vulnerability-assessment/README.md diff --git a/modules/sql/server/vulnerability-assessments/main.bicep b/modules/sql/server/vulnerability-assessment/main.bicep similarity index 100% rename from modules/sql/server/vulnerability-assessments/main.bicep rename to modules/sql/server/vulnerability-assessment/main.bicep diff --git a/modules/sql/server/vulnerability-assessments/main.json b/modules/sql/server/vulnerability-assessment/main.json similarity index 100% rename from modules/sql/server/vulnerability-assessments/main.json rename to modules/sql/server/vulnerability-assessment/main.json diff --git a/modules/sql/server/vulnerability-assessments/version.json b/modules/sql/server/vulnerability-assessment/version.json similarity index 100% rename from modules/sql/server/vulnerability-assessments/version.json rename to modules/sql/server/vulnerability-assessment/version.json diff --git a/modules/storage/storage-account/blob-services/README.md b/modules/storage/storage-account/blob-service/README.md similarity index 100% rename from modules/storage/storage-account/blob-services/README.md rename to modules/storage/storage-account/blob-service/README.md diff --git a/modules/storage/storage-account/blob-services/containers/.bicep/nested_roleAssignments.bicep b/modules/storage/storage-account/blob-service/containers/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/storage/storage-account/blob-services/containers/.bicep/nested_roleAssignments.bicep rename to modules/storage/storage-account/blob-service/containers/.bicep/nested_roleAssignments.bicep diff --git a/modules/storage/storage-account/blob-services/containers/README.md b/modules/storage/storage-account/blob-service/containers/README.md similarity index 100% rename from modules/storage/storage-account/blob-services/containers/README.md rename to modules/storage/storage-account/blob-service/containers/README.md diff --git a/modules/storage/storage-account/blob-services/containers/immutability-policies/README.md b/modules/storage/storage-account/blob-service/containers/immutability-policies/README.md similarity index 100% rename from modules/storage/storage-account/blob-services/containers/immutability-policies/README.md rename to modules/storage/storage-account/blob-service/containers/immutability-policies/README.md diff --git a/modules/storage/storage-account/blob-services/containers/immutability-policies/main.bicep b/modules/storage/storage-account/blob-service/containers/immutability-policies/main.bicep similarity index 100% rename from modules/storage/storage-account/blob-services/containers/immutability-policies/main.bicep rename to modules/storage/storage-account/blob-service/containers/immutability-policies/main.bicep diff --git a/modules/storage/storage-account/blob-services/containers/immutability-policies/main.json b/modules/storage/storage-account/blob-service/containers/immutability-policies/main.json similarity index 100% rename from modules/storage/storage-account/blob-services/containers/immutability-policies/main.json rename to modules/storage/storage-account/blob-service/containers/immutability-policies/main.json diff --git a/modules/storage/storage-account/blob-services/containers/immutability-policies/version.json b/modules/storage/storage-account/blob-service/containers/immutability-policies/version.json similarity index 100% rename from modules/storage/storage-account/blob-services/containers/immutability-policies/version.json rename to modules/storage/storage-account/blob-service/containers/immutability-policies/version.json diff --git a/modules/storage/storage-account/blob-services/containers/main.bicep b/modules/storage/storage-account/blob-service/containers/main.bicep similarity index 100% rename from modules/storage/storage-account/blob-services/containers/main.bicep rename to modules/storage/storage-account/blob-service/containers/main.bicep diff --git a/modules/storage/storage-account/blob-services/containers/main.json b/modules/storage/storage-account/blob-service/containers/main.json similarity index 100% rename from modules/storage/storage-account/blob-services/containers/main.json rename to modules/storage/storage-account/blob-service/containers/main.json diff --git a/modules/storage/storage-account/blob-services/containers/version.json b/modules/storage/storage-account/blob-service/containers/version.json similarity index 100% rename from modules/storage/storage-account/blob-services/containers/version.json rename to modules/storage/storage-account/blob-service/containers/version.json diff --git a/modules/storage/storage-account/blob-services/main.bicep b/modules/storage/storage-account/blob-service/main.bicep similarity index 100% rename from modules/storage/storage-account/blob-services/main.bicep rename to modules/storage/storage-account/blob-service/main.bicep diff --git a/modules/storage/storage-account/blob-services/main.json b/modules/storage/storage-account/blob-service/main.json similarity index 100% rename from modules/storage/storage-account/blob-services/main.json rename to modules/storage/storage-account/blob-service/main.json diff --git a/modules/storage/storage-account/blob-services/version.json b/modules/storage/storage-account/blob-service/version.json similarity index 100% rename from modules/storage/storage-account/blob-services/version.json rename to modules/storage/storage-account/blob-service/version.json diff --git a/modules/storage/storage-account/file-services/README.md b/modules/storage/storage-account/file-service/README.md similarity index 100% rename from modules/storage/storage-account/file-services/README.md rename to modules/storage/storage-account/file-service/README.md diff --git a/modules/storage/storage-account/file-services/main.bicep b/modules/storage/storage-account/file-service/main.bicep similarity index 100% rename from modules/storage/storage-account/file-services/main.bicep rename to modules/storage/storage-account/file-service/main.bicep diff --git a/modules/storage/storage-account/file-services/main.json b/modules/storage/storage-account/file-service/main.json similarity index 100% rename from modules/storage/storage-account/file-services/main.json rename to modules/storage/storage-account/file-service/main.json diff --git a/modules/storage/storage-account/file-services/shares/.bicep/nested_roleAssignments.bicep b/modules/storage/storage-account/file-service/shares/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/storage/storage-account/file-services/shares/.bicep/nested_roleAssignments.bicep rename to modules/storage/storage-account/file-service/shares/.bicep/nested_roleAssignments.bicep diff --git a/modules/storage/storage-account/file-services/shares/README.md b/modules/storage/storage-account/file-service/shares/README.md similarity index 100% rename from modules/storage/storage-account/file-services/shares/README.md rename to modules/storage/storage-account/file-service/shares/README.md diff --git a/modules/storage/storage-account/file-services/shares/main.bicep b/modules/storage/storage-account/file-service/shares/main.bicep similarity index 100% rename from modules/storage/storage-account/file-services/shares/main.bicep rename to modules/storage/storage-account/file-service/shares/main.bicep diff --git a/modules/storage/storage-account/file-services/shares/main.json b/modules/storage/storage-account/file-service/shares/main.json similarity index 100% rename from modules/storage/storage-account/file-services/shares/main.json rename to modules/storage/storage-account/file-service/shares/main.json diff --git a/modules/storage/storage-account/file-services/shares/version.json b/modules/storage/storage-account/file-service/shares/version.json similarity index 100% rename from modules/storage/storage-account/file-services/shares/version.json rename to modules/storage/storage-account/file-service/shares/version.json diff --git a/modules/storage/storage-account/file-services/version.json b/modules/storage/storage-account/file-service/version.json similarity index 100% rename from modules/storage/storage-account/file-services/version.json rename to modules/storage/storage-account/file-service/version.json diff --git a/modules/storage/storage-account/local-users/README.md b/modules/storage/storage-account/local-user/README.md similarity index 100% rename from modules/storage/storage-account/local-users/README.md rename to modules/storage/storage-account/local-user/README.md diff --git a/modules/storage/storage-account/local-users/main.bicep b/modules/storage/storage-account/local-user/main.bicep similarity index 100% rename from modules/storage/storage-account/local-users/main.bicep rename to modules/storage/storage-account/local-user/main.bicep diff --git a/modules/storage/storage-account/local-users/main.json b/modules/storage/storage-account/local-user/main.json similarity index 100% rename from modules/storage/storage-account/local-users/main.json rename to modules/storage/storage-account/local-user/main.json diff --git a/modules/storage/storage-account/local-users/version.json b/modules/storage/storage-account/local-user/version.json similarity index 100% rename from modules/storage/storage-account/local-users/version.json rename to modules/storage/storage-account/local-user/version.json diff --git a/modules/storage/storage-account/management-policies/README.md b/modules/storage/storage-account/management-policy/README.md similarity index 100% rename from modules/storage/storage-account/management-policies/README.md rename to modules/storage/storage-account/management-policy/README.md diff --git a/modules/storage/storage-account/management-policies/main.bicep b/modules/storage/storage-account/management-policy/main.bicep similarity index 100% rename from modules/storage/storage-account/management-policies/main.bicep rename to modules/storage/storage-account/management-policy/main.bicep diff --git a/modules/storage/storage-account/management-policies/main.json b/modules/storage/storage-account/management-policy/main.json similarity index 100% rename from modules/storage/storage-account/management-policies/main.json rename to modules/storage/storage-account/management-policy/main.json diff --git a/modules/storage/storage-account/management-policies/version.json b/modules/storage/storage-account/management-policy/version.json similarity index 100% rename from modules/storage/storage-account/management-policies/version.json rename to modules/storage/storage-account/management-policy/version.json diff --git a/modules/storage/storage-account/queue-services/README.md b/modules/storage/storage-account/queue-service/README.md similarity index 100% rename from modules/storage/storage-account/queue-services/README.md rename to modules/storage/storage-account/queue-service/README.md diff --git a/modules/storage/storage-account/queue-services/main.bicep b/modules/storage/storage-account/queue-service/main.bicep similarity index 100% rename from modules/storage/storage-account/queue-services/main.bicep rename to modules/storage/storage-account/queue-service/main.bicep diff --git a/modules/storage/storage-account/queue-services/main.json b/modules/storage/storage-account/queue-service/main.json similarity index 100% rename from modules/storage/storage-account/queue-services/main.json rename to modules/storage/storage-account/queue-service/main.json diff --git a/modules/storage/storage-account/queue-services/queues/.bicep/nested_roleAssignments.bicep b/modules/storage/storage-account/queue-service/queues/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/storage/storage-account/queue-services/queues/.bicep/nested_roleAssignments.bicep rename to modules/storage/storage-account/queue-service/queues/.bicep/nested_roleAssignments.bicep diff --git a/modules/storage/storage-account/queue-services/queues/README.md b/modules/storage/storage-account/queue-service/queues/README.md similarity index 100% rename from modules/storage/storage-account/queue-services/queues/README.md rename to modules/storage/storage-account/queue-service/queues/README.md diff --git a/modules/storage/storage-account/queue-services/queues/main.bicep b/modules/storage/storage-account/queue-service/queues/main.bicep similarity index 100% rename from modules/storage/storage-account/queue-services/queues/main.bicep rename to modules/storage/storage-account/queue-service/queues/main.bicep diff --git a/modules/storage/storage-account/queue-services/queues/main.json b/modules/storage/storage-account/queue-service/queues/main.json similarity index 100% rename from modules/storage/storage-account/queue-services/queues/main.json rename to modules/storage/storage-account/queue-service/queues/main.json diff --git a/modules/storage/storage-account/queue-services/queues/version.json b/modules/storage/storage-account/queue-service/queues/version.json similarity index 100% rename from modules/storage/storage-account/queue-services/queues/version.json rename to modules/storage/storage-account/queue-service/queues/version.json diff --git a/modules/storage/storage-account/queue-services/version.json b/modules/storage/storage-account/queue-service/version.json similarity index 100% rename from modules/storage/storage-account/queue-services/version.json rename to modules/storage/storage-account/queue-service/version.json diff --git a/modules/storage/storage-account/table-services/README.md b/modules/storage/storage-account/table-service/README.md similarity index 100% rename from modules/storage/storage-account/table-services/README.md rename to modules/storage/storage-account/table-service/README.md diff --git a/modules/storage/storage-account/table-services/main.bicep b/modules/storage/storage-account/table-service/main.bicep similarity index 100% rename from modules/storage/storage-account/table-services/main.bicep rename to modules/storage/storage-account/table-service/main.bicep diff --git a/modules/storage/storage-account/table-services/main.json b/modules/storage/storage-account/table-service/main.json similarity index 100% rename from modules/storage/storage-account/table-services/main.json rename to modules/storage/storage-account/table-service/main.json diff --git a/modules/storage/storage-account/table-services/tables/README.md b/modules/storage/storage-account/table-service/tables/README.md similarity index 100% rename from modules/storage/storage-account/table-services/tables/README.md rename to modules/storage/storage-account/table-service/tables/README.md diff --git a/modules/storage/storage-account/table-services/tables/main.bicep b/modules/storage/storage-account/table-service/tables/main.bicep similarity index 100% rename from modules/storage/storage-account/table-services/tables/main.bicep rename to modules/storage/storage-account/table-service/tables/main.bicep diff --git a/modules/storage/storage-account/table-services/tables/main.json b/modules/storage/storage-account/table-service/tables/main.json similarity index 100% rename from modules/storage/storage-account/table-services/tables/main.json rename to modules/storage/storage-account/table-service/tables/main.json diff --git a/modules/storage/storage-account/table-services/tables/version.json b/modules/storage/storage-account/table-service/tables/version.json similarity index 100% rename from modules/storage/storage-account/table-services/tables/version.json rename to modules/storage/storage-account/table-service/tables/version.json diff --git a/modules/storage/storage-account/table-services/version.json b/modules/storage/storage-account/table-service/version.json similarity index 100% rename from modules/storage/storage-account/table-services/version.json rename to modules/storage/storage-account/table-service/version.json diff --git a/modules/synapse/workspace/integration-runtimes/README.md b/modules/synapse/workspace/integration-runtime/README.md similarity index 100% rename from modules/synapse/workspace/integration-runtimes/README.md rename to modules/synapse/workspace/integration-runtime/README.md diff --git a/modules/synapse/workspace/integration-runtimes/main.bicep b/modules/synapse/workspace/integration-runtime/main.bicep similarity index 100% rename from modules/synapse/workspace/integration-runtimes/main.bicep rename to modules/synapse/workspace/integration-runtime/main.bicep diff --git a/modules/synapse/workspace/integration-runtimes/main.json b/modules/synapse/workspace/integration-runtime/main.json similarity index 100% rename from modules/synapse/workspace/integration-runtimes/main.json rename to modules/synapse/workspace/integration-runtime/main.json diff --git a/modules/synapse/workspace/integration-runtimes/version.json b/modules/synapse/workspace/integration-runtime/version.json similarity index 100% rename from modules/synapse/workspace/integration-runtimes/version.json rename to modules/synapse/workspace/integration-runtime/version.json diff --git a/modules/synapse/workspace/keys/README.md b/modules/synapse/workspace/key/README.md similarity index 100% rename from modules/synapse/workspace/keys/README.md rename to modules/synapse/workspace/key/README.md diff --git a/modules/synapse/workspace/keys/main.bicep b/modules/synapse/workspace/key/main.bicep similarity index 100% rename from modules/synapse/workspace/keys/main.bicep rename to modules/synapse/workspace/key/main.bicep diff --git a/modules/synapse/workspace/keys/main.json b/modules/synapse/workspace/key/main.json similarity index 100% rename from modules/synapse/workspace/keys/main.json rename to modules/synapse/workspace/key/main.json diff --git a/modules/synapse/workspace/keys/version.json b/modules/synapse/workspace/key/version.json similarity index 100% rename from modules/synapse/workspace/keys/version.json rename to modules/synapse/workspace/key/version.json diff --git a/modules/web/site/basic-publishing-credentials-policies/README.md b/modules/web/site/basic-publishing-credentials-policy/README.md similarity index 100% rename from modules/web/site/basic-publishing-credentials-policies/README.md rename to modules/web/site/basic-publishing-credentials-policy/README.md diff --git a/modules/web/site/basic-publishing-credentials-policies/main.bicep b/modules/web/site/basic-publishing-credentials-policy/main.bicep similarity index 100% rename from modules/web/site/basic-publishing-credentials-policies/main.bicep rename to modules/web/site/basic-publishing-credentials-policy/main.bicep diff --git a/modules/web/site/basic-publishing-credentials-policies/main.json b/modules/web/site/basic-publishing-credentials-policy/main.json similarity index 100% rename from modules/web/site/basic-publishing-credentials-policies/main.json rename to modules/web/site/basic-publishing-credentials-policy/main.json diff --git a/modules/web/site/basic-publishing-credentials-policies/version.json b/modules/web/site/basic-publishing-credentials-policy/version.json similarity index 100% rename from modules/web/site/basic-publishing-credentials-policies/version.json rename to modules/web/site/basic-publishing-credentials-policy/version.json diff --git a/modules/web/site/config--appsettings/README.md b/modules/web/site/config--appsetting/README.md similarity index 100% rename from modules/web/site/config--appsettings/README.md rename to modules/web/site/config--appsetting/README.md diff --git a/modules/web/site/config--appsettings/main.bicep b/modules/web/site/config--appsetting/main.bicep similarity index 100% rename from modules/web/site/config--appsettings/main.bicep rename to modules/web/site/config--appsetting/main.bicep diff --git a/modules/web/site/config--appsettings/main.json b/modules/web/site/config--appsetting/main.json similarity index 100% rename from modules/web/site/config--appsettings/main.json rename to modules/web/site/config--appsetting/main.json diff --git a/modules/web/site/config--appsettings/version.json b/modules/web/site/config--appsetting/version.json similarity index 100% rename from modules/web/site/config--appsettings/version.json rename to modules/web/site/config--appsetting/version.json diff --git a/modules/web/site/hybrid-connection-namespaces/relays/README.md b/modules/web/site/hybrid-connection-namespace/relays/README.md similarity index 100% rename from modules/web/site/hybrid-connection-namespaces/relays/README.md rename to modules/web/site/hybrid-connection-namespace/relays/README.md diff --git a/modules/web/site/hybrid-connection-namespaces/relays/main.bicep b/modules/web/site/hybrid-connection-namespace/relays/main.bicep similarity index 100% rename from modules/web/site/hybrid-connection-namespaces/relays/main.bicep rename to modules/web/site/hybrid-connection-namespace/relays/main.bicep diff --git a/modules/web/site/hybrid-connection-namespaces/relays/main.json b/modules/web/site/hybrid-connection-namespace/relays/main.json similarity index 100% rename from modules/web/site/hybrid-connection-namespaces/relays/main.json rename to modules/web/site/hybrid-connection-namespace/relays/main.json diff --git a/modules/web/site/hybrid-connection-namespaces/relays/version.json b/modules/web/site/hybrid-connection-namespace/relays/version.json similarity index 100% rename from modules/web/site/hybrid-connection-namespaces/relays/version.json rename to modules/web/site/hybrid-connection-namespace/relays/version.json diff --git a/modules/web/site/slots/.bicep/nested_roleAssignments.bicep b/modules/web/site/slot/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/web/site/slots/.bicep/nested_roleAssignments.bicep rename to modules/web/site/slot/.bicep/nested_roleAssignments.bicep diff --git a/modules/web/site/slots/README.md b/modules/web/site/slot/README.md similarity index 100% rename from modules/web/site/slots/README.md rename to modules/web/site/slot/README.md diff --git a/modules/web/site/slots/config--appsettings/README.md b/modules/web/site/slot/config--appsettings/README.md similarity index 100% rename from modules/web/site/slots/config--appsettings/README.md rename to modules/web/site/slot/config--appsettings/README.md diff --git a/modules/web/site/slots/config--appsettings/main.bicep b/modules/web/site/slot/config--appsettings/main.bicep similarity index 100% rename from modules/web/site/slots/config--appsettings/main.bicep rename to modules/web/site/slot/config--appsettings/main.bicep diff --git a/modules/web/site/slots/config--appsettings/main.json b/modules/web/site/slot/config--appsettings/main.json similarity index 100% rename from modules/web/site/slots/config--appsettings/main.json rename to modules/web/site/slot/config--appsettings/main.json diff --git a/modules/web/site/slots/config--appsettings/version.json b/modules/web/site/slot/config--appsettings/version.json similarity index 100% rename from modules/web/site/slots/config--appsettings/version.json rename to modules/web/site/slot/config--appsettings/version.json diff --git a/modules/web/site/slots/config--authsettingsv2/README.md b/modules/web/site/slot/config--authsettingsv2/README.md similarity index 100% rename from modules/web/site/slots/config--authsettingsv2/README.md rename to modules/web/site/slot/config--authsettingsv2/README.md diff --git a/modules/web/site/slots/config--authsettingsv2/main.bicep b/modules/web/site/slot/config--authsettingsv2/main.bicep similarity index 100% rename from modules/web/site/slots/config--authsettingsv2/main.bicep rename to modules/web/site/slot/config--authsettingsv2/main.bicep diff --git a/modules/web/site/slots/config--authsettingsv2/main.json b/modules/web/site/slot/config--authsettingsv2/main.json similarity index 100% rename from modules/web/site/slots/config--authsettingsv2/main.json rename to modules/web/site/slot/config--authsettingsv2/main.json diff --git a/modules/web/site/slots/config--authsettingsv2/version.json b/modules/web/site/slot/config--authsettingsv2/version.json similarity index 100% rename from modules/web/site/slots/config--authsettingsv2/version.json rename to modules/web/site/slot/config--authsettingsv2/version.json diff --git a/modules/web/site/slots/hybrid-connection-namespaces/relays/README.md b/modules/web/site/slot/hybrid-connection-namespaces/relays/README.md similarity index 100% rename from modules/web/site/slots/hybrid-connection-namespaces/relays/README.md rename to modules/web/site/slot/hybrid-connection-namespaces/relays/README.md diff --git a/modules/web/site/slots/hybrid-connection-namespaces/relays/main.bicep b/modules/web/site/slot/hybrid-connection-namespaces/relays/main.bicep similarity index 100% rename from modules/web/site/slots/hybrid-connection-namespaces/relays/main.bicep rename to modules/web/site/slot/hybrid-connection-namespaces/relays/main.bicep diff --git a/modules/web/site/slots/hybrid-connection-namespaces/relays/main.json b/modules/web/site/slot/hybrid-connection-namespaces/relays/main.json similarity index 100% rename from modules/web/site/slots/hybrid-connection-namespaces/relays/main.json rename to modules/web/site/slot/hybrid-connection-namespaces/relays/main.json diff --git a/modules/web/site/slots/hybrid-connection-namespaces/relays/version.json b/modules/web/site/slot/hybrid-connection-namespaces/relays/version.json similarity index 100% rename from modules/web/site/slots/hybrid-connection-namespaces/relays/version.json rename to modules/web/site/slot/hybrid-connection-namespaces/relays/version.json diff --git a/modules/web/site/slots/main.bicep b/modules/web/site/slot/main.bicep similarity index 100% rename from modules/web/site/slots/main.bicep rename to modules/web/site/slot/main.bicep diff --git a/modules/web/site/slots/main.json b/modules/web/site/slot/main.json similarity index 100% rename from modules/web/site/slots/main.json rename to modules/web/site/slot/main.json diff --git a/modules/web/site/slots/version.json b/modules/web/site/slot/version.json similarity index 100% rename from modules/web/site/slots/version.json rename to modules/web/site/slot/version.json diff --git a/modules/web/static-site/custom-domains/README.md b/modules/web/static-site/custom-domain/README.md similarity index 100% rename from modules/web/static-site/custom-domains/README.md rename to modules/web/static-site/custom-domain/README.md diff --git a/modules/web/static-site/custom-domains/main.bicep b/modules/web/static-site/custom-domain/main.bicep similarity index 100% rename from modules/web/static-site/custom-domains/main.bicep rename to modules/web/static-site/custom-domain/main.bicep diff --git a/modules/web/static-site/custom-domains/main.json b/modules/web/static-site/custom-domain/main.json similarity index 100% rename from modules/web/static-site/custom-domains/main.json rename to modules/web/static-site/custom-domain/main.json diff --git a/modules/web/static-site/custom-domains/version.json b/modules/web/static-site/custom-domain/version.json similarity index 100% rename from modules/web/static-site/custom-domains/version.json rename to modules/web/static-site/custom-domain/version.json diff --git a/modules/web/static-site/linked-backends/README.md b/modules/web/static-site/linked-backend/README.md similarity index 100% rename from modules/web/static-site/linked-backends/README.md rename to modules/web/static-site/linked-backend/README.md diff --git a/modules/web/static-site/linked-backends/main.bicep b/modules/web/static-site/linked-backend/main.bicep similarity index 100% rename from modules/web/static-site/linked-backends/main.bicep rename to modules/web/static-site/linked-backend/main.bicep diff --git a/modules/web/static-site/linked-backends/main.json b/modules/web/static-site/linked-backend/main.json similarity index 100% rename from modules/web/static-site/linked-backends/main.json rename to modules/web/static-site/linked-backend/main.json diff --git a/modules/web/static-site/linked-backends/version.json b/modules/web/static-site/linked-backend/version.json similarity index 100% rename from modules/web/static-site/linked-backends/version.json rename to modules/web/static-site/linked-backend/version.json From 96a9ae9fc34ba4a6bdbde487b4467ccc04b2f553 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Fri, 11 Aug 2023 21:31:32 +0200 Subject: [PATCH 03/15] third run --- modules/dev-test-lab/lab/policyset/{policies => policy}/README.md | 0 .../dev-test-lab/lab/policyset/{policies => policy}/main.bicep | 0 modules/dev-test-lab/lab/policyset/{policies => policy}/main.json | 0 .../dev-test-lab/lab/policyset/{policies => policy}/version.json | 0 .../database-account/gremlin-database/{graphs => graph}/README.md | 0 .../gremlin-database/{graphs => graph}/main.bicep | 0 .../database-account/gremlin-database/{graphs => graph}/main.json | 0 .../gremlin-database/{graphs => graph}/version.json | 0 .../mongodb-database/{collections => collection}/README.md | 0 .../mongodb-database/{collections => collection}/main.bicep | 0 .../mongodb-database/{collections => collection}/main.json | 0 .../mongodb-database/{collections => collection}/version.json | 0 .../sql-database/{containers => container}/README.md | 0 .../sql-database/{containers => container}/main.bicep | 0 .../sql-database/{containers => container}/main.json | 0 .../sql-database/{containers => container}/version.json | 0 .../{authorization-rules => authorization-rule}/README.md | 0 .../{authorization-rules => authorization-rule}/main.bicep | 0 .../{authorization-rules => authorization-rule}/main.json | 0 .../{authorization-rules => authorization-rule}/version.json | 0 .../eventhub/{consumergroups => consumergroup}/README.md | 0 .../eventhub/{consumergroups => consumergroup}/main.bicep | 0 .../eventhub/{consumergroups => consumergroup}/main.json | 0 .../eventhub/{consumergroups => consumergroup}/version.json | 0 .../iotconnector/{fhirdestinations => fhirdestination}/README.md | 0 .../iotconnector/{fhirdestinations => fhirdestination}/main.bicep | 0 .../iotconnector/{fhirdestinations => fhirdestination}/main.json | 0 .../{fhirdestinations => fhirdestination}/version.json | 0 .../{volumes => volume}/.bicep/nested_roleAssignments.bicep | 0 .../net-app-account/capacity-pool/{volumes => volume}/README.md | 0 .../net-app-account/capacity-pool/{volumes => volume}/main.bicep | 0 .../net-app-account/capacity-pool/{volumes => volume}/main.json | 0 .../capacity-pool/{volumes => volume}/version.json | 0 .../network-group/{static-members => static-member}/README.md | 0 .../network-group/{static-members => static-member}/main.bicep | 0 .../network-group/{static-members => static-member}/main.json | 0 .../network-group/{static-members => static-member}/version.json | 0 .../{rule-collections => rule-collection}/README.md | 0 .../{rule-collections => rule-collection}/main.bicep | 0 .../{rule-collections => rule-collection}/main.json | 0 .../{rule-collections => rule-collection}/rules/README.md | 0 .../{rule-collections => rule-collection}/rules/main.bicep | 0 .../{rule-collections => rule-collection}/rules/main.json | 0 .../{rule-collections => rule-collection}/rules/version.json | 0 .../{rule-collections => rule-collection}/version.json | 0 .../{protected-items => protected-item}/README.md | 0 .../{protected-items => protected-item}/main.bicep | 0 .../{protected-items => protected-item}/main.json | 0 .../{protected-items => protected-item}/version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../replication-protection-container-mappings/README.md | 0 .../replication-protection-container-mappings/main.bicep | 0 .../replication-protection-container-mappings/main.json | 0 .../replication-protection-container-mappings/version.json | 0 .../version.json | 0 .../{authorization-rules => authorization-rule}/README.md | 0 .../{authorization-rules => authorization-rule}/main.bicep | 0 .../{authorization-rules => authorization-rule}/main.json | 0 .../{authorization-rules => authorization-rule}/version.json | 0 .../{authorization-rules => authorization-rule}/README.md | 0 .../{authorization-rules => authorization-rule}/main.bicep | 0 .../{authorization-rules => authorization-rule}/main.json | 0 .../{authorization-rules => authorization-rule}/version.json | 0 .../queue/{authorization-rules => authorization-rule}/README.md | 0 .../queue/{authorization-rules => authorization-rule}/main.bicep | 0 .../queue/{authorization-rules => authorization-rule}/main.json | 0 .../{authorization-rules => authorization-rule}/version.json | 0 .../topic/{authorization-rules => authorization-rule}/README.md | 0 .../topic/{authorization-rules => authorization-rule}/main.bicep | 0 .../topic/{authorization-rules => authorization-rule}/main.json | 0 .../{authorization-rules => authorization-rule}/version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../{containers => container}/.bicep/nested_roleAssignments.bicep | 0 .../blob-service/{containers => container}/README.md | 0 .../{containers => container}/immutability-policies/README.md | 0 .../{containers => container}/immutability-policies/main.bicep | 0 .../{containers => container}/immutability-policies/main.json | 0 .../{containers => container}/immutability-policies/version.json | 0 .../blob-service/{containers => container}/main.bicep | 0 .../blob-service/{containers => container}/main.json | 0 .../blob-service/{containers => container}/version.json | 0 .../{shares => share}/.bicep/nested_roleAssignments.bicep | 0 .../storage-account/file-service/{shares => share}/README.md | 0 .../storage-account/file-service/{shares => share}/main.bicep | 0 .../storage-account/file-service/{shares => share}/main.json | 0 .../storage-account/file-service/{shares => share}/version.json | 0 .../{queues => queue}/.bicep/nested_roleAssignments.bicep | 0 .../storage-account/queue-service/{queues => queue}/README.md | 0 .../storage-account/queue-service/{queues => queue}/main.bicep | 0 .../storage-account/queue-service/{queues => queue}/main.json | 0 .../storage-account/queue-service/{queues => queue}/version.json | 0 .../storage-account/table-service/{tables => table}/README.md | 0 .../storage-account/table-service/{tables => table}/main.bicep | 0 .../storage-account/table-service/{tables => table}/main.json | 0 .../storage-account/table-service/{tables => table}/version.json | 0 .../site/hybrid-connection-namespace/{relays => relay}/README.md | 0 .../site/hybrid-connection-namespace/{relays => relay}/main.bicep | 0 .../site/hybrid-connection-namespace/{relays => relay}/main.json | 0 .../hybrid-connection-namespace/{relays => relay}/version.json | 0 .../slot/{config--appsettings => config--appsetting}/README.md | 0 .../slot/{config--appsettings => config--appsetting}/main.bicep | 0 .../slot/{config--appsettings => config--appsetting}/main.json | 0 .../slot/{config--appsettings => config--appsetting}/version.json | 0 .../relays/README.md | 0 .../relays/main.bicep | 0 .../relays/main.json | 0 .../relays/version.json | 0 124 files changed, 0 insertions(+), 0 deletions(-) rename modules/dev-test-lab/lab/policyset/{policies => policy}/README.md (100%) rename modules/dev-test-lab/lab/policyset/{policies => policy}/main.bicep (100%) rename modules/dev-test-lab/lab/policyset/{policies => policy}/main.json (100%) rename modules/dev-test-lab/lab/policyset/{policies => policy}/version.json (100%) rename modules/document-db/database-account/gremlin-database/{graphs => graph}/README.md (100%) rename modules/document-db/database-account/gremlin-database/{graphs => graph}/main.bicep (100%) rename modules/document-db/database-account/gremlin-database/{graphs => graph}/main.json (100%) rename modules/document-db/database-account/gremlin-database/{graphs => graph}/version.json (100%) rename modules/document-db/database-account/mongodb-database/{collections => collection}/README.md (100%) rename modules/document-db/database-account/mongodb-database/{collections => collection}/main.bicep (100%) rename modules/document-db/database-account/mongodb-database/{collections => collection}/main.json (100%) rename modules/document-db/database-account/mongodb-database/{collections => collection}/version.json (100%) rename modules/document-db/database-account/sql-database/{containers => container}/README.md (100%) rename modules/document-db/database-account/sql-database/{containers => container}/main.bicep (100%) rename modules/document-db/database-account/sql-database/{containers => container}/main.json (100%) rename modules/document-db/database-account/sql-database/{containers => container}/version.json (100%) rename modules/event-hub/namespace/eventhub/{authorization-rules => authorization-rule}/README.md (100%) rename modules/event-hub/namespace/eventhub/{authorization-rules => authorization-rule}/main.bicep (100%) rename modules/event-hub/namespace/eventhub/{authorization-rules => authorization-rule}/main.json (100%) rename modules/event-hub/namespace/eventhub/{authorization-rules => authorization-rule}/version.json (100%) rename modules/event-hub/namespace/eventhub/{consumergroups => consumergroup}/README.md (100%) rename modules/event-hub/namespace/eventhub/{consumergroups => consumergroup}/main.bicep (100%) rename modules/event-hub/namespace/eventhub/{consumergroups => consumergroup}/main.json (100%) rename modules/event-hub/namespace/eventhub/{consumergroups => consumergroup}/version.json (100%) rename modules/healthcare-apis/workspace/iotconnector/{fhirdestinations => fhirdestination}/README.md (100%) rename modules/healthcare-apis/workspace/iotconnector/{fhirdestinations => fhirdestination}/main.bicep (100%) rename modules/healthcare-apis/workspace/iotconnector/{fhirdestinations => fhirdestination}/main.json (100%) rename modules/healthcare-apis/workspace/iotconnector/{fhirdestinations => fhirdestination}/version.json (100%) rename modules/net-app/net-app-account/capacity-pool/{volumes => volume}/.bicep/nested_roleAssignments.bicep (100%) rename modules/net-app/net-app-account/capacity-pool/{volumes => volume}/README.md (100%) rename modules/net-app/net-app-account/capacity-pool/{volumes => volume}/main.bicep (100%) rename modules/net-app/net-app-account/capacity-pool/{volumes => volume}/main.json (100%) rename modules/net-app/net-app-account/capacity-pool/{volumes => volume}/version.json (100%) rename modules/network/network-manager/network-group/{static-members => static-member}/README.md (100%) rename modules/network/network-manager/network-group/{static-members => static-member}/main.bicep (100%) rename modules/network/network-manager/network-group/{static-members => static-member}/main.json (100%) rename modules/network/network-manager/network-group/{static-members => static-member}/version.json (100%) rename modules/network/network-manager/security-admin-configuration/{rule-collections => rule-collection}/README.md (100%) rename modules/network/network-manager/security-admin-configuration/{rule-collections => rule-collection}/main.bicep (100%) rename modules/network/network-manager/security-admin-configuration/{rule-collections => rule-collection}/main.json (100%) rename modules/network/network-manager/security-admin-configuration/{rule-collections => rule-collection}/rules/README.md (100%) rename modules/network/network-manager/security-admin-configuration/{rule-collections => rule-collection}/rules/main.bicep (100%) rename modules/network/network-manager/security-admin-configuration/{rule-collections => rule-collection}/rules/main.json (100%) rename modules/network/network-manager/security-admin-configuration/{rule-collections => rule-collection}/rules/version.json (100%) rename modules/network/network-manager/security-admin-configuration/{rule-collections => rule-collection}/version.json (100%) rename modules/recovery-services/vault/backup-fabrics/protection-container/{protected-items => protected-item}/README.md (100%) rename modules/recovery-services/vault/backup-fabrics/protection-container/{protected-items => protected-item}/main.bicep (100%) rename modules/recovery-services/vault/backup-fabrics/protection-container/{protected-items => protected-item}/main.json (100%) rename modules/recovery-services/vault/backup-fabrics/protection-container/{protected-items => protected-item}/version.json (100%) rename modules/recovery-services/vault/replication-fabric/{replication-protection-containers => replication-protection-container}/README.md (100%) rename modules/recovery-services/vault/replication-fabric/{replication-protection-containers => replication-protection-container}/main.bicep (100%) rename modules/recovery-services/vault/replication-fabric/{replication-protection-containers => replication-protection-container}/main.json (100%) rename modules/recovery-services/vault/replication-fabric/{replication-protection-containers => replication-protection-container}/replication-protection-container-mappings/README.md (100%) rename modules/recovery-services/vault/replication-fabric/{replication-protection-containers => replication-protection-container}/replication-protection-container-mappings/main.bicep (100%) rename modules/recovery-services/vault/replication-fabric/{replication-protection-containers => replication-protection-container}/replication-protection-container-mappings/main.json (100%) rename modules/recovery-services/vault/replication-fabric/{replication-protection-containers => replication-protection-container}/replication-protection-container-mappings/version.json (100%) rename modules/recovery-services/vault/replication-fabric/{replication-protection-containers => replication-protection-container}/version.json (100%) rename modules/relay/namespace/hybrid-connection/{authorization-rules => authorization-rule}/README.md (100%) rename modules/relay/namespace/hybrid-connection/{authorization-rules => authorization-rule}/main.bicep (100%) rename modules/relay/namespace/hybrid-connection/{authorization-rules => authorization-rule}/main.json (100%) rename modules/relay/namespace/hybrid-connection/{authorization-rules => authorization-rule}/version.json (100%) rename modules/relay/namespace/wcf-relay/{authorization-rules => authorization-rule}/README.md (100%) rename modules/relay/namespace/wcf-relay/{authorization-rules => authorization-rule}/main.bicep (100%) rename modules/relay/namespace/wcf-relay/{authorization-rules => authorization-rule}/main.json (100%) rename modules/relay/namespace/wcf-relay/{authorization-rules => authorization-rule}/version.json (100%) rename modules/service-bus/namespace/queue/{authorization-rules => authorization-rule}/README.md (100%) rename modules/service-bus/namespace/queue/{authorization-rules => authorization-rule}/main.bicep (100%) rename modules/service-bus/namespace/queue/{authorization-rules => authorization-rule}/main.json (100%) rename modules/service-bus/namespace/queue/{authorization-rules => authorization-rule}/version.json (100%) rename modules/service-bus/namespace/topic/{authorization-rules => authorization-rule}/README.md (100%) rename modules/service-bus/namespace/topic/{authorization-rules => authorization-rule}/main.bicep (100%) rename modules/service-bus/namespace/topic/{authorization-rules => authorization-rule}/main.json (100%) rename modules/service-bus/namespace/topic/{authorization-rules => authorization-rule}/version.json (100%) rename modules/sql/managed-instance/database/{backup-long-term-retention-policies => backup-long-term-retention-policy}/README.md (100%) rename modules/sql/managed-instance/database/{backup-long-term-retention-policies => backup-long-term-retention-policy}/main.bicep (100%) rename modules/sql/managed-instance/database/{backup-long-term-retention-policies => backup-long-term-retention-policy}/main.json (100%) rename modules/sql/managed-instance/database/{backup-long-term-retention-policies => backup-long-term-retention-policy}/version.json (100%) rename modules/sql/managed-instance/database/{backup-short-term-retention-policies => backup-short-term-retention-policy}/README.md (100%) rename modules/sql/managed-instance/database/{backup-short-term-retention-policies => backup-short-term-retention-policy}/main.bicep (100%) rename modules/sql/managed-instance/database/{backup-short-term-retention-policies => backup-short-term-retention-policy}/main.json (100%) rename modules/sql/managed-instance/database/{backup-short-term-retention-policies => backup-short-term-retention-policy}/version.json (100%) rename modules/sql/server/database/{backup-long-term-retention-policies => backup-long-term-retention-policy}/README.md (100%) rename modules/sql/server/database/{backup-long-term-retention-policies => backup-long-term-retention-policy}/main.bicep (100%) rename modules/sql/server/database/{backup-long-term-retention-policies => backup-long-term-retention-policy}/main.json (100%) rename modules/sql/server/database/{backup-long-term-retention-policies => backup-long-term-retention-policy}/version.json (100%) rename modules/sql/server/database/{backup-short-term-retention-policies => backup-short-term-retention-policy}/README.md (100%) rename modules/sql/server/database/{backup-short-term-retention-policies => backup-short-term-retention-policy}/main.bicep (100%) rename modules/sql/server/database/{backup-short-term-retention-policies => backup-short-term-retention-policy}/main.json (100%) rename modules/sql/server/database/{backup-short-term-retention-policies => backup-short-term-retention-policy}/version.json (100%) rename modules/storage/storage-account/blob-service/{containers => container}/.bicep/nested_roleAssignments.bicep (100%) rename modules/storage/storage-account/blob-service/{containers => container}/README.md (100%) rename modules/storage/storage-account/blob-service/{containers => container}/immutability-policies/README.md (100%) rename modules/storage/storage-account/blob-service/{containers => container}/immutability-policies/main.bicep (100%) rename modules/storage/storage-account/blob-service/{containers => container}/immutability-policies/main.json (100%) rename modules/storage/storage-account/blob-service/{containers => container}/immutability-policies/version.json (100%) rename modules/storage/storage-account/blob-service/{containers => container}/main.bicep (100%) rename modules/storage/storage-account/blob-service/{containers => container}/main.json (100%) rename modules/storage/storage-account/blob-service/{containers => container}/version.json (100%) rename modules/storage/storage-account/file-service/{shares => share}/.bicep/nested_roleAssignments.bicep (100%) rename modules/storage/storage-account/file-service/{shares => share}/README.md (100%) rename modules/storage/storage-account/file-service/{shares => share}/main.bicep (100%) rename modules/storage/storage-account/file-service/{shares => share}/main.json (100%) rename modules/storage/storage-account/file-service/{shares => share}/version.json (100%) rename modules/storage/storage-account/queue-service/{queues => queue}/.bicep/nested_roleAssignments.bicep (100%) rename modules/storage/storage-account/queue-service/{queues => queue}/README.md (100%) rename modules/storage/storage-account/queue-service/{queues => queue}/main.bicep (100%) rename modules/storage/storage-account/queue-service/{queues => queue}/main.json (100%) rename modules/storage/storage-account/queue-service/{queues => queue}/version.json (100%) rename modules/storage/storage-account/table-service/{tables => table}/README.md (100%) rename modules/storage/storage-account/table-service/{tables => table}/main.bicep (100%) rename modules/storage/storage-account/table-service/{tables => table}/main.json (100%) rename modules/storage/storage-account/table-service/{tables => table}/version.json (100%) rename modules/web/site/hybrid-connection-namespace/{relays => relay}/README.md (100%) rename modules/web/site/hybrid-connection-namespace/{relays => relay}/main.bicep (100%) rename modules/web/site/hybrid-connection-namespace/{relays => relay}/main.json (100%) rename modules/web/site/hybrid-connection-namespace/{relays => relay}/version.json (100%) rename modules/web/site/slot/{config--appsettings => config--appsetting}/README.md (100%) rename modules/web/site/slot/{config--appsettings => config--appsetting}/main.bicep (100%) rename modules/web/site/slot/{config--appsettings => config--appsetting}/main.json (100%) rename modules/web/site/slot/{config--appsettings => config--appsetting}/version.json (100%) rename modules/web/site/slot/{hybrid-connection-namespaces => hybrid-connection-namespace}/relays/README.md (100%) rename modules/web/site/slot/{hybrid-connection-namespaces => hybrid-connection-namespace}/relays/main.bicep (100%) rename modules/web/site/slot/{hybrid-connection-namespaces => hybrid-connection-namespace}/relays/main.json (100%) rename modules/web/site/slot/{hybrid-connection-namespaces => hybrid-connection-namespace}/relays/version.json (100%) diff --git a/modules/dev-test-lab/lab/policyset/policies/README.md b/modules/dev-test-lab/lab/policyset/policy/README.md similarity index 100% rename from modules/dev-test-lab/lab/policyset/policies/README.md rename to modules/dev-test-lab/lab/policyset/policy/README.md diff --git a/modules/dev-test-lab/lab/policyset/policies/main.bicep b/modules/dev-test-lab/lab/policyset/policy/main.bicep similarity index 100% rename from modules/dev-test-lab/lab/policyset/policies/main.bicep rename to modules/dev-test-lab/lab/policyset/policy/main.bicep diff --git a/modules/dev-test-lab/lab/policyset/policies/main.json b/modules/dev-test-lab/lab/policyset/policy/main.json similarity index 100% rename from modules/dev-test-lab/lab/policyset/policies/main.json rename to modules/dev-test-lab/lab/policyset/policy/main.json diff --git a/modules/dev-test-lab/lab/policyset/policies/version.json b/modules/dev-test-lab/lab/policyset/policy/version.json similarity index 100% rename from modules/dev-test-lab/lab/policyset/policies/version.json rename to modules/dev-test-lab/lab/policyset/policy/version.json diff --git a/modules/document-db/database-account/gremlin-database/graphs/README.md b/modules/document-db/database-account/gremlin-database/graph/README.md similarity index 100% rename from modules/document-db/database-account/gremlin-database/graphs/README.md rename to modules/document-db/database-account/gremlin-database/graph/README.md diff --git a/modules/document-db/database-account/gremlin-database/graphs/main.bicep b/modules/document-db/database-account/gremlin-database/graph/main.bicep similarity index 100% rename from modules/document-db/database-account/gremlin-database/graphs/main.bicep rename to modules/document-db/database-account/gremlin-database/graph/main.bicep diff --git a/modules/document-db/database-account/gremlin-database/graphs/main.json b/modules/document-db/database-account/gremlin-database/graph/main.json similarity index 100% rename from modules/document-db/database-account/gremlin-database/graphs/main.json rename to modules/document-db/database-account/gremlin-database/graph/main.json diff --git a/modules/document-db/database-account/gremlin-database/graphs/version.json b/modules/document-db/database-account/gremlin-database/graph/version.json similarity index 100% rename from modules/document-db/database-account/gremlin-database/graphs/version.json rename to modules/document-db/database-account/gremlin-database/graph/version.json diff --git a/modules/document-db/database-account/mongodb-database/collections/README.md b/modules/document-db/database-account/mongodb-database/collection/README.md similarity index 100% rename from modules/document-db/database-account/mongodb-database/collections/README.md rename to modules/document-db/database-account/mongodb-database/collection/README.md diff --git a/modules/document-db/database-account/mongodb-database/collections/main.bicep b/modules/document-db/database-account/mongodb-database/collection/main.bicep similarity index 100% rename from modules/document-db/database-account/mongodb-database/collections/main.bicep rename to modules/document-db/database-account/mongodb-database/collection/main.bicep diff --git a/modules/document-db/database-account/mongodb-database/collections/main.json b/modules/document-db/database-account/mongodb-database/collection/main.json similarity index 100% rename from modules/document-db/database-account/mongodb-database/collections/main.json rename to modules/document-db/database-account/mongodb-database/collection/main.json diff --git a/modules/document-db/database-account/mongodb-database/collections/version.json b/modules/document-db/database-account/mongodb-database/collection/version.json similarity index 100% rename from modules/document-db/database-account/mongodb-database/collections/version.json rename to modules/document-db/database-account/mongodb-database/collection/version.json diff --git a/modules/document-db/database-account/sql-database/containers/README.md b/modules/document-db/database-account/sql-database/container/README.md similarity index 100% rename from modules/document-db/database-account/sql-database/containers/README.md rename to modules/document-db/database-account/sql-database/container/README.md diff --git a/modules/document-db/database-account/sql-database/containers/main.bicep b/modules/document-db/database-account/sql-database/container/main.bicep similarity index 100% rename from modules/document-db/database-account/sql-database/containers/main.bicep rename to modules/document-db/database-account/sql-database/container/main.bicep diff --git a/modules/document-db/database-account/sql-database/containers/main.json b/modules/document-db/database-account/sql-database/container/main.json similarity index 100% rename from modules/document-db/database-account/sql-database/containers/main.json rename to modules/document-db/database-account/sql-database/container/main.json diff --git a/modules/document-db/database-account/sql-database/containers/version.json b/modules/document-db/database-account/sql-database/container/version.json similarity index 100% rename from modules/document-db/database-account/sql-database/containers/version.json rename to modules/document-db/database-account/sql-database/container/version.json diff --git a/modules/event-hub/namespace/eventhub/authorization-rules/README.md b/modules/event-hub/namespace/eventhub/authorization-rule/README.md similarity index 100% rename from modules/event-hub/namespace/eventhub/authorization-rules/README.md rename to modules/event-hub/namespace/eventhub/authorization-rule/README.md diff --git a/modules/event-hub/namespace/eventhub/authorization-rules/main.bicep b/modules/event-hub/namespace/eventhub/authorization-rule/main.bicep similarity index 100% rename from modules/event-hub/namespace/eventhub/authorization-rules/main.bicep rename to modules/event-hub/namespace/eventhub/authorization-rule/main.bicep diff --git a/modules/event-hub/namespace/eventhub/authorization-rules/main.json b/modules/event-hub/namespace/eventhub/authorization-rule/main.json similarity index 100% rename from modules/event-hub/namespace/eventhub/authorization-rules/main.json rename to modules/event-hub/namespace/eventhub/authorization-rule/main.json diff --git a/modules/event-hub/namespace/eventhub/authorization-rules/version.json b/modules/event-hub/namespace/eventhub/authorization-rule/version.json similarity index 100% rename from modules/event-hub/namespace/eventhub/authorization-rules/version.json rename to modules/event-hub/namespace/eventhub/authorization-rule/version.json diff --git a/modules/event-hub/namespace/eventhub/consumergroups/README.md b/modules/event-hub/namespace/eventhub/consumergroup/README.md similarity index 100% rename from modules/event-hub/namespace/eventhub/consumergroups/README.md rename to modules/event-hub/namespace/eventhub/consumergroup/README.md diff --git a/modules/event-hub/namespace/eventhub/consumergroups/main.bicep b/modules/event-hub/namespace/eventhub/consumergroup/main.bicep similarity index 100% rename from modules/event-hub/namespace/eventhub/consumergroups/main.bicep rename to modules/event-hub/namespace/eventhub/consumergroup/main.bicep diff --git a/modules/event-hub/namespace/eventhub/consumergroups/main.json b/modules/event-hub/namespace/eventhub/consumergroup/main.json similarity index 100% rename from modules/event-hub/namespace/eventhub/consumergroups/main.json rename to modules/event-hub/namespace/eventhub/consumergroup/main.json diff --git a/modules/event-hub/namespace/eventhub/consumergroups/version.json b/modules/event-hub/namespace/eventhub/consumergroup/version.json similarity index 100% rename from modules/event-hub/namespace/eventhub/consumergroups/version.json rename to modules/event-hub/namespace/eventhub/consumergroup/version.json diff --git a/modules/healthcare-apis/workspace/iotconnector/fhirdestinations/README.md b/modules/healthcare-apis/workspace/iotconnector/fhirdestination/README.md similarity index 100% rename from modules/healthcare-apis/workspace/iotconnector/fhirdestinations/README.md rename to modules/healthcare-apis/workspace/iotconnector/fhirdestination/README.md diff --git a/modules/healthcare-apis/workspace/iotconnector/fhirdestinations/main.bicep b/modules/healthcare-apis/workspace/iotconnector/fhirdestination/main.bicep similarity index 100% rename from modules/healthcare-apis/workspace/iotconnector/fhirdestinations/main.bicep rename to modules/healthcare-apis/workspace/iotconnector/fhirdestination/main.bicep diff --git a/modules/healthcare-apis/workspace/iotconnector/fhirdestinations/main.json b/modules/healthcare-apis/workspace/iotconnector/fhirdestination/main.json similarity index 100% rename from modules/healthcare-apis/workspace/iotconnector/fhirdestinations/main.json rename to modules/healthcare-apis/workspace/iotconnector/fhirdestination/main.json diff --git a/modules/healthcare-apis/workspace/iotconnector/fhirdestinations/version.json b/modules/healthcare-apis/workspace/iotconnector/fhirdestination/version.json similarity index 100% rename from modules/healthcare-apis/workspace/iotconnector/fhirdestinations/version.json rename to modules/healthcare-apis/workspace/iotconnector/fhirdestination/version.json diff --git a/modules/net-app/net-app-account/capacity-pool/volumes/.bicep/nested_roleAssignments.bicep b/modules/net-app/net-app-account/capacity-pool/volume/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/net-app/net-app-account/capacity-pool/volumes/.bicep/nested_roleAssignments.bicep rename to modules/net-app/net-app-account/capacity-pool/volume/.bicep/nested_roleAssignments.bicep diff --git a/modules/net-app/net-app-account/capacity-pool/volumes/README.md b/modules/net-app/net-app-account/capacity-pool/volume/README.md similarity index 100% rename from modules/net-app/net-app-account/capacity-pool/volumes/README.md rename to modules/net-app/net-app-account/capacity-pool/volume/README.md diff --git a/modules/net-app/net-app-account/capacity-pool/volumes/main.bicep b/modules/net-app/net-app-account/capacity-pool/volume/main.bicep similarity index 100% rename from modules/net-app/net-app-account/capacity-pool/volumes/main.bicep rename to modules/net-app/net-app-account/capacity-pool/volume/main.bicep diff --git a/modules/net-app/net-app-account/capacity-pool/volumes/main.json b/modules/net-app/net-app-account/capacity-pool/volume/main.json similarity index 100% rename from modules/net-app/net-app-account/capacity-pool/volumes/main.json rename to modules/net-app/net-app-account/capacity-pool/volume/main.json diff --git a/modules/net-app/net-app-account/capacity-pool/volumes/version.json b/modules/net-app/net-app-account/capacity-pool/volume/version.json similarity index 100% rename from modules/net-app/net-app-account/capacity-pool/volumes/version.json rename to modules/net-app/net-app-account/capacity-pool/volume/version.json diff --git a/modules/network/network-manager/network-group/static-members/README.md b/modules/network/network-manager/network-group/static-member/README.md similarity index 100% rename from modules/network/network-manager/network-group/static-members/README.md rename to modules/network/network-manager/network-group/static-member/README.md diff --git a/modules/network/network-manager/network-group/static-members/main.bicep b/modules/network/network-manager/network-group/static-member/main.bicep similarity index 100% rename from modules/network/network-manager/network-group/static-members/main.bicep rename to modules/network/network-manager/network-group/static-member/main.bicep diff --git a/modules/network/network-manager/network-group/static-members/main.json b/modules/network/network-manager/network-group/static-member/main.json similarity index 100% rename from modules/network/network-manager/network-group/static-members/main.json rename to modules/network/network-manager/network-group/static-member/main.json diff --git a/modules/network/network-manager/network-group/static-members/version.json b/modules/network/network-manager/network-group/static-member/version.json similarity index 100% rename from modules/network/network-manager/network-group/static-members/version.json rename to modules/network/network-manager/network-group/static-member/version.json diff --git a/modules/network/network-manager/security-admin-configuration/rule-collections/README.md b/modules/network/network-manager/security-admin-configuration/rule-collection/README.md similarity index 100% rename from modules/network/network-manager/security-admin-configuration/rule-collections/README.md rename to modules/network/network-manager/security-admin-configuration/rule-collection/README.md diff --git a/modules/network/network-manager/security-admin-configuration/rule-collections/main.bicep b/modules/network/network-manager/security-admin-configuration/rule-collection/main.bicep similarity index 100% rename from modules/network/network-manager/security-admin-configuration/rule-collections/main.bicep rename to modules/network/network-manager/security-admin-configuration/rule-collection/main.bicep diff --git a/modules/network/network-manager/security-admin-configuration/rule-collections/main.json b/modules/network/network-manager/security-admin-configuration/rule-collection/main.json similarity index 100% rename from modules/network/network-manager/security-admin-configuration/rule-collections/main.json rename to modules/network/network-manager/security-admin-configuration/rule-collection/main.json diff --git a/modules/network/network-manager/security-admin-configuration/rule-collections/rules/README.md b/modules/network/network-manager/security-admin-configuration/rule-collection/rules/README.md similarity index 100% rename from modules/network/network-manager/security-admin-configuration/rule-collections/rules/README.md rename to modules/network/network-manager/security-admin-configuration/rule-collection/rules/README.md diff --git a/modules/network/network-manager/security-admin-configuration/rule-collections/rules/main.bicep b/modules/network/network-manager/security-admin-configuration/rule-collection/rules/main.bicep similarity index 100% rename from modules/network/network-manager/security-admin-configuration/rule-collections/rules/main.bicep rename to modules/network/network-manager/security-admin-configuration/rule-collection/rules/main.bicep diff --git a/modules/network/network-manager/security-admin-configuration/rule-collections/rules/main.json b/modules/network/network-manager/security-admin-configuration/rule-collection/rules/main.json similarity index 100% rename from modules/network/network-manager/security-admin-configuration/rule-collections/rules/main.json rename to modules/network/network-manager/security-admin-configuration/rule-collection/rules/main.json diff --git a/modules/network/network-manager/security-admin-configuration/rule-collections/rules/version.json b/modules/network/network-manager/security-admin-configuration/rule-collection/rules/version.json similarity index 100% rename from modules/network/network-manager/security-admin-configuration/rule-collections/rules/version.json rename to modules/network/network-manager/security-admin-configuration/rule-collection/rules/version.json diff --git a/modules/network/network-manager/security-admin-configuration/rule-collections/version.json b/modules/network/network-manager/security-admin-configuration/rule-collection/version.json similarity index 100% rename from modules/network/network-manager/security-admin-configuration/rule-collections/version.json rename to modules/network/network-manager/security-admin-configuration/rule-collection/version.json diff --git a/modules/recovery-services/vault/backup-fabrics/protection-container/protected-items/README.md b/modules/recovery-services/vault/backup-fabrics/protection-container/protected-item/README.md similarity index 100% rename from modules/recovery-services/vault/backup-fabrics/protection-container/protected-items/README.md rename to modules/recovery-services/vault/backup-fabrics/protection-container/protected-item/README.md diff --git a/modules/recovery-services/vault/backup-fabrics/protection-container/protected-items/main.bicep b/modules/recovery-services/vault/backup-fabrics/protection-container/protected-item/main.bicep similarity index 100% rename from modules/recovery-services/vault/backup-fabrics/protection-container/protected-items/main.bicep rename to modules/recovery-services/vault/backup-fabrics/protection-container/protected-item/main.bicep diff --git a/modules/recovery-services/vault/backup-fabrics/protection-container/protected-items/main.json b/modules/recovery-services/vault/backup-fabrics/protection-container/protected-item/main.json similarity index 100% rename from modules/recovery-services/vault/backup-fabrics/protection-container/protected-items/main.json rename to modules/recovery-services/vault/backup-fabrics/protection-container/protected-item/main.json diff --git a/modules/recovery-services/vault/backup-fabrics/protection-container/protected-items/version.json b/modules/recovery-services/vault/backup-fabrics/protection-container/protected-item/version.json similarity index 100% rename from modules/recovery-services/vault/backup-fabrics/protection-container/protected-items/version.json rename to modules/recovery-services/vault/backup-fabrics/protection-container/protected-item/version.json diff --git a/modules/recovery-services/vault/replication-fabric/replication-protection-containers/README.md b/modules/recovery-services/vault/replication-fabric/replication-protection-container/README.md similarity index 100% rename from modules/recovery-services/vault/replication-fabric/replication-protection-containers/README.md rename to modules/recovery-services/vault/replication-fabric/replication-protection-container/README.md diff --git a/modules/recovery-services/vault/replication-fabric/replication-protection-containers/main.bicep b/modules/recovery-services/vault/replication-fabric/replication-protection-container/main.bicep similarity index 100% rename from modules/recovery-services/vault/replication-fabric/replication-protection-containers/main.bicep rename to modules/recovery-services/vault/replication-fabric/replication-protection-container/main.bicep diff --git a/modules/recovery-services/vault/replication-fabric/replication-protection-containers/main.json b/modules/recovery-services/vault/replication-fabric/replication-protection-container/main.json similarity index 100% rename from modules/recovery-services/vault/replication-fabric/replication-protection-containers/main.json rename to modules/recovery-services/vault/replication-fabric/replication-protection-container/main.json diff --git a/modules/recovery-services/vault/replication-fabric/replication-protection-containers/replication-protection-container-mappings/README.md b/modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mappings/README.md similarity index 100% rename from modules/recovery-services/vault/replication-fabric/replication-protection-containers/replication-protection-container-mappings/README.md rename to modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mappings/README.md diff --git a/modules/recovery-services/vault/replication-fabric/replication-protection-containers/replication-protection-container-mappings/main.bicep b/modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mappings/main.bicep similarity index 100% rename from modules/recovery-services/vault/replication-fabric/replication-protection-containers/replication-protection-container-mappings/main.bicep rename to modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mappings/main.bicep diff --git a/modules/recovery-services/vault/replication-fabric/replication-protection-containers/replication-protection-container-mappings/main.json b/modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mappings/main.json similarity index 100% rename from modules/recovery-services/vault/replication-fabric/replication-protection-containers/replication-protection-container-mappings/main.json rename to modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mappings/main.json diff --git a/modules/recovery-services/vault/replication-fabric/replication-protection-containers/replication-protection-container-mappings/version.json b/modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mappings/version.json similarity index 100% rename from modules/recovery-services/vault/replication-fabric/replication-protection-containers/replication-protection-container-mappings/version.json rename to modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mappings/version.json diff --git a/modules/recovery-services/vault/replication-fabric/replication-protection-containers/version.json b/modules/recovery-services/vault/replication-fabric/replication-protection-container/version.json similarity index 100% rename from modules/recovery-services/vault/replication-fabric/replication-protection-containers/version.json rename to modules/recovery-services/vault/replication-fabric/replication-protection-container/version.json diff --git a/modules/relay/namespace/hybrid-connection/authorization-rules/README.md b/modules/relay/namespace/hybrid-connection/authorization-rule/README.md similarity index 100% rename from modules/relay/namespace/hybrid-connection/authorization-rules/README.md rename to modules/relay/namespace/hybrid-connection/authorization-rule/README.md diff --git a/modules/relay/namespace/hybrid-connection/authorization-rules/main.bicep b/modules/relay/namespace/hybrid-connection/authorization-rule/main.bicep similarity index 100% rename from modules/relay/namespace/hybrid-connection/authorization-rules/main.bicep rename to modules/relay/namespace/hybrid-connection/authorization-rule/main.bicep diff --git a/modules/relay/namespace/hybrid-connection/authorization-rules/main.json b/modules/relay/namespace/hybrid-connection/authorization-rule/main.json similarity index 100% rename from modules/relay/namespace/hybrid-connection/authorization-rules/main.json rename to modules/relay/namespace/hybrid-connection/authorization-rule/main.json diff --git a/modules/relay/namespace/hybrid-connection/authorization-rules/version.json b/modules/relay/namespace/hybrid-connection/authorization-rule/version.json similarity index 100% rename from modules/relay/namespace/hybrid-connection/authorization-rules/version.json rename to modules/relay/namespace/hybrid-connection/authorization-rule/version.json diff --git a/modules/relay/namespace/wcf-relay/authorization-rules/README.md b/modules/relay/namespace/wcf-relay/authorization-rule/README.md similarity index 100% rename from modules/relay/namespace/wcf-relay/authorization-rules/README.md rename to modules/relay/namespace/wcf-relay/authorization-rule/README.md diff --git a/modules/relay/namespace/wcf-relay/authorization-rules/main.bicep b/modules/relay/namespace/wcf-relay/authorization-rule/main.bicep similarity index 100% rename from modules/relay/namespace/wcf-relay/authorization-rules/main.bicep rename to modules/relay/namespace/wcf-relay/authorization-rule/main.bicep diff --git a/modules/relay/namespace/wcf-relay/authorization-rules/main.json b/modules/relay/namespace/wcf-relay/authorization-rule/main.json similarity index 100% rename from modules/relay/namespace/wcf-relay/authorization-rules/main.json rename to modules/relay/namespace/wcf-relay/authorization-rule/main.json diff --git a/modules/relay/namespace/wcf-relay/authorization-rules/version.json b/modules/relay/namespace/wcf-relay/authorization-rule/version.json similarity index 100% rename from modules/relay/namespace/wcf-relay/authorization-rules/version.json rename to modules/relay/namespace/wcf-relay/authorization-rule/version.json diff --git a/modules/service-bus/namespace/queue/authorization-rules/README.md b/modules/service-bus/namespace/queue/authorization-rule/README.md similarity index 100% rename from modules/service-bus/namespace/queue/authorization-rules/README.md rename to modules/service-bus/namespace/queue/authorization-rule/README.md diff --git a/modules/service-bus/namespace/queue/authorization-rules/main.bicep b/modules/service-bus/namespace/queue/authorization-rule/main.bicep similarity index 100% rename from modules/service-bus/namespace/queue/authorization-rules/main.bicep rename to modules/service-bus/namespace/queue/authorization-rule/main.bicep diff --git a/modules/service-bus/namespace/queue/authorization-rules/main.json b/modules/service-bus/namespace/queue/authorization-rule/main.json similarity index 100% rename from modules/service-bus/namespace/queue/authorization-rules/main.json rename to modules/service-bus/namespace/queue/authorization-rule/main.json diff --git a/modules/service-bus/namespace/queue/authorization-rules/version.json b/modules/service-bus/namespace/queue/authorization-rule/version.json similarity index 100% rename from modules/service-bus/namespace/queue/authorization-rules/version.json rename to modules/service-bus/namespace/queue/authorization-rule/version.json diff --git a/modules/service-bus/namespace/topic/authorization-rules/README.md b/modules/service-bus/namespace/topic/authorization-rule/README.md similarity index 100% rename from modules/service-bus/namespace/topic/authorization-rules/README.md rename to modules/service-bus/namespace/topic/authorization-rule/README.md diff --git a/modules/service-bus/namespace/topic/authorization-rules/main.bicep b/modules/service-bus/namespace/topic/authorization-rule/main.bicep similarity index 100% rename from modules/service-bus/namespace/topic/authorization-rules/main.bicep rename to modules/service-bus/namespace/topic/authorization-rule/main.bicep diff --git a/modules/service-bus/namespace/topic/authorization-rules/main.json b/modules/service-bus/namespace/topic/authorization-rule/main.json similarity index 100% rename from modules/service-bus/namespace/topic/authorization-rules/main.json rename to modules/service-bus/namespace/topic/authorization-rule/main.json diff --git a/modules/service-bus/namespace/topic/authorization-rules/version.json b/modules/service-bus/namespace/topic/authorization-rule/version.json similarity index 100% rename from modules/service-bus/namespace/topic/authorization-rules/version.json rename to modules/service-bus/namespace/topic/authorization-rule/version.json diff --git a/modules/sql/managed-instance/database/backup-long-term-retention-policies/README.md b/modules/sql/managed-instance/database/backup-long-term-retention-policy/README.md similarity index 100% rename from modules/sql/managed-instance/database/backup-long-term-retention-policies/README.md rename to modules/sql/managed-instance/database/backup-long-term-retention-policy/README.md diff --git a/modules/sql/managed-instance/database/backup-long-term-retention-policies/main.bicep b/modules/sql/managed-instance/database/backup-long-term-retention-policy/main.bicep similarity index 100% rename from modules/sql/managed-instance/database/backup-long-term-retention-policies/main.bicep rename to modules/sql/managed-instance/database/backup-long-term-retention-policy/main.bicep diff --git a/modules/sql/managed-instance/database/backup-long-term-retention-policies/main.json b/modules/sql/managed-instance/database/backup-long-term-retention-policy/main.json similarity index 100% rename from modules/sql/managed-instance/database/backup-long-term-retention-policies/main.json rename to modules/sql/managed-instance/database/backup-long-term-retention-policy/main.json diff --git a/modules/sql/managed-instance/database/backup-long-term-retention-policies/version.json b/modules/sql/managed-instance/database/backup-long-term-retention-policy/version.json similarity index 100% rename from modules/sql/managed-instance/database/backup-long-term-retention-policies/version.json rename to modules/sql/managed-instance/database/backup-long-term-retention-policy/version.json diff --git a/modules/sql/managed-instance/database/backup-short-term-retention-policies/README.md b/modules/sql/managed-instance/database/backup-short-term-retention-policy/README.md similarity index 100% rename from modules/sql/managed-instance/database/backup-short-term-retention-policies/README.md rename to modules/sql/managed-instance/database/backup-short-term-retention-policy/README.md diff --git a/modules/sql/managed-instance/database/backup-short-term-retention-policies/main.bicep b/modules/sql/managed-instance/database/backup-short-term-retention-policy/main.bicep similarity index 100% rename from modules/sql/managed-instance/database/backup-short-term-retention-policies/main.bicep rename to modules/sql/managed-instance/database/backup-short-term-retention-policy/main.bicep diff --git a/modules/sql/managed-instance/database/backup-short-term-retention-policies/main.json b/modules/sql/managed-instance/database/backup-short-term-retention-policy/main.json similarity index 100% rename from modules/sql/managed-instance/database/backup-short-term-retention-policies/main.json rename to modules/sql/managed-instance/database/backup-short-term-retention-policy/main.json diff --git a/modules/sql/managed-instance/database/backup-short-term-retention-policies/version.json b/modules/sql/managed-instance/database/backup-short-term-retention-policy/version.json similarity index 100% rename from modules/sql/managed-instance/database/backup-short-term-retention-policies/version.json rename to modules/sql/managed-instance/database/backup-short-term-retention-policy/version.json diff --git a/modules/sql/server/database/backup-long-term-retention-policies/README.md b/modules/sql/server/database/backup-long-term-retention-policy/README.md similarity index 100% rename from modules/sql/server/database/backup-long-term-retention-policies/README.md rename to modules/sql/server/database/backup-long-term-retention-policy/README.md diff --git a/modules/sql/server/database/backup-long-term-retention-policies/main.bicep b/modules/sql/server/database/backup-long-term-retention-policy/main.bicep similarity index 100% rename from modules/sql/server/database/backup-long-term-retention-policies/main.bicep rename to modules/sql/server/database/backup-long-term-retention-policy/main.bicep diff --git a/modules/sql/server/database/backup-long-term-retention-policies/main.json b/modules/sql/server/database/backup-long-term-retention-policy/main.json similarity index 100% rename from modules/sql/server/database/backup-long-term-retention-policies/main.json rename to modules/sql/server/database/backup-long-term-retention-policy/main.json diff --git a/modules/sql/server/database/backup-long-term-retention-policies/version.json b/modules/sql/server/database/backup-long-term-retention-policy/version.json similarity index 100% rename from modules/sql/server/database/backup-long-term-retention-policies/version.json rename to modules/sql/server/database/backup-long-term-retention-policy/version.json diff --git a/modules/sql/server/database/backup-short-term-retention-policies/README.md b/modules/sql/server/database/backup-short-term-retention-policy/README.md similarity index 100% rename from modules/sql/server/database/backup-short-term-retention-policies/README.md rename to modules/sql/server/database/backup-short-term-retention-policy/README.md diff --git a/modules/sql/server/database/backup-short-term-retention-policies/main.bicep b/modules/sql/server/database/backup-short-term-retention-policy/main.bicep similarity index 100% rename from modules/sql/server/database/backup-short-term-retention-policies/main.bicep rename to modules/sql/server/database/backup-short-term-retention-policy/main.bicep diff --git a/modules/sql/server/database/backup-short-term-retention-policies/main.json b/modules/sql/server/database/backup-short-term-retention-policy/main.json similarity index 100% rename from modules/sql/server/database/backup-short-term-retention-policies/main.json rename to modules/sql/server/database/backup-short-term-retention-policy/main.json diff --git a/modules/sql/server/database/backup-short-term-retention-policies/version.json b/modules/sql/server/database/backup-short-term-retention-policy/version.json similarity index 100% rename from modules/sql/server/database/backup-short-term-retention-policies/version.json rename to modules/sql/server/database/backup-short-term-retention-policy/version.json diff --git a/modules/storage/storage-account/blob-service/containers/.bicep/nested_roleAssignments.bicep b/modules/storage/storage-account/blob-service/container/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/storage/storage-account/blob-service/containers/.bicep/nested_roleAssignments.bicep rename to modules/storage/storage-account/blob-service/container/.bicep/nested_roleAssignments.bicep diff --git a/modules/storage/storage-account/blob-service/containers/README.md b/modules/storage/storage-account/blob-service/container/README.md similarity index 100% rename from modules/storage/storage-account/blob-service/containers/README.md rename to modules/storage/storage-account/blob-service/container/README.md diff --git a/modules/storage/storage-account/blob-service/containers/immutability-policies/README.md b/modules/storage/storage-account/blob-service/container/immutability-policies/README.md similarity index 100% rename from modules/storage/storage-account/blob-service/containers/immutability-policies/README.md rename to modules/storage/storage-account/blob-service/container/immutability-policies/README.md diff --git a/modules/storage/storage-account/blob-service/containers/immutability-policies/main.bicep b/modules/storage/storage-account/blob-service/container/immutability-policies/main.bicep similarity index 100% rename from modules/storage/storage-account/blob-service/containers/immutability-policies/main.bicep rename to modules/storage/storage-account/blob-service/container/immutability-policies/main.bicep diff --git a/modules/storage/storage-account/blob-service/containers/immutability-policies/main.json b/modules/storage/storage-account/blob-service/container/immutability-policies/main.json similarity index 100% rename from modules/storage/storage-account/blob-service/containers/immutability-policies/main.json rename to modules/storage/storage-account/blob-service/container/immutability-policies/main.json diff --git a/modules/storage/storage-account/blob-service/containers/immutability-policies/version.json b/modules/storage/storage-account/blob-service/container/immutability-policies/version.json similarity index 100% rename from modules/storage/storage-account/blob-service/containers/immutability-policies/version.json rename to modules/storage/storage-account/blob-service/container/immutability-policies/version.json diff --git a/modules/storage/storage-account/blob-service/containers/main.bicep b/modules/storage/storage-account/blob-service/container/main.bicep similarity index 100% rename from modules/storage/storage-account/blob-service/containers/main.bicep rename to modules/storage/storage-account/blob-service/container/main.bicep diff --git a/modules/storage/storage-account/blob-service/containers/main.json b/modules/storage/storage-account/blob-service/container/main.json similarity index 100% rename from modules/storage/storage-account/blob-service/containers/main.json rename to modules/storage/storage-account/blob-service/container/main.json diff --git a/modules/storage/storage-account/blob-service/containers/version.json b/modules/storage/storage-account/blob-service/container/version.json similarity index 100% rename from modules/storage/storage-account/blob-service/containers/version.json rename to modules/storage/storage-account/blob-service/container/version.json diff --git a/modules/storage/storage-account/file-service/shares/.bicep/nested_roleAssignments.bicep b/modules/storage/storage-account/file-service/share/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/storage/storage-account/file-service/shares/.bicep/nested_roleAssignments.bicep rename to modules/storage/storage-account/file-service/share/.bicep/nested_roleAssignments.bicep diff --git a/modules/storage/storage-account/file-service/shares/README.md b/modules/storage/storage-account/file-service/share/README.md similarity index 100% rename from modules/storage/storage-account/file-service/shares/README.md rename to modules/storage/storage-account/file-service/share/README.md diff --git a/modules/storage/storage-account/file-service/shares/main.bicep b/modules/storage/storage-account/file-service/share/main.bicep similarity index 100% rename from modules/storage/storage-account/file-service/shares/main.bicep rename to modules/storage/storage-account/file-service/share/main.bicep diff --git a/modules/storage/storage-account/file-service/shares/main.json b/modules/storage/storage-account/file-service/share/main.json similarity index 100% rename from modules/storage/storage-account/file-service/shares/main.json rename to modules/storage/storage-account/file-service/share/main.json diff --git a/modules/storage/storage-account/file-service/shares/version.json b/modules/storage/storage-account/file-service/share/version.json similarity index 100% rename from modules/storage/storage-account/file-service/shares/version.json rename to modules/storage/storage-account/file-service/share/version.json diff --git a/modules/storage/storage-account/queue-service/queues/.bicep/nested_roleAssignments.bicep b/modules/storage/storage-account/queue-service/queue/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/storage/storage-account/queue-service/queues/.bicep/nested_roleAssignments.bicep rename to modules/storage/storage-account/queue-service/queue/.bicep/nested_roleAssignments.bicep diff --git a/modules/storage/storage-account/queue-service/queues/README.md b/modules/storage/storage-account/queue-service/queue/README.md similarity index 100% rename from modules/storage/storage-account/queue-service/queues/README.md rename to modules/storage/storage-account/queue-service/queue/README.md diff --git a/modules/storage/storage-account/queue-service/queues/main.bicep b/modules/storage/storage-account/queue-service/queue/main.bicep similarity index 100% rename from modules/storage/storage-account/queue-service/queues/main.bicep rename to modules/storage/storage-account/queue-service/queue/main.bicep diff --git a/modules/storage/storage-account/queue-service/queues/main.json b/modules/storage/storage-account/queue-service/queue/main.json similarity index 100% rename from modules/storage/storage-account/queue-service/queues/main.json rename to modules/storage/storage-account/queue-service/queue/main.json diff --git a/modules/storage/storage-account/queue-service/queues/version.json b/modules/storage/storage-account/queue-service/queue/version.json similarity index 100% rename from modules/storage/storage-account/queue-service/queues/version.json rename to modules/storage/storage-account/queue-service/queue/version.json diff --git a/modules/storage/storage-account/table-service/tables/README.md b/modules/storage/storage-account/table-service/table/README.md similarity index 100% rename from modules/storage/storage-account/table-service/tables/README.md rename to modules/storage/storage-account/table-service/table/README.md diff --git a/modules/storage/storage-account/table-service/tables/main.bicep b/modules/storage/storage-account/table-service/table/main.bicep similarity index 100% rename from modules/storage/storage-account/table-service/tables/main.bicep rename to modules/storage/storage-account/table-service/table/main.bicep diff --git a/modules/storage/storage-account/table-service/tables/main.json b/modules/storage/storage-account/table-service/table/main.json similarity index 100% rename from modules/storage/storage-account/table-service/tables/main.json rename to modules/storage/storage-account/table-service/table/main.json diff --git a/modules/storage/storage-account/table-service/tables/version.json b/modules/storage/storage-account/table-service/table/version.json similarity index 100% rename from modules/storage/storage-account/table-service/tables/version.json rename to modules/storage/storage-account/table-service/table/version.json diff --git a/modules/web/site/hybrid-connection-namespace/relays/README.md b/modules/web/site/hybrid-connection-namespace/relay/README.md similarity index 100% rename from modules/web/site/hybrid-connection-namespace/relays/README.md rename to modules/web/site/hybrid-connection-namespace/relay/README.md diff --git a/modules/web/site/hybrid-connection-namespace/relays/main.bicep b/modules/web/site/hybrid-connection-namespace/relay/main.bicep similarity index 100% rename from modules/web/site/hybrid-connection-namespace/relays/main.bicep rename to modules/web/site/hybrid-connection-namespace/relay/main.bicep diff --git a/modules/web/site/hybrid-connection-namespace/relays/main.json b/modules/web/site/hybrid-connection-namespace/relay/main.json similarity index 100% rename from modules/web/site/hybrid-connection-namespace/relays/main.json rename to modules/web/site/hybrid-connection-namespace/relay/main.json diff --git a/modules/web/site/hybrid-connection-namespace/relays/version.json b/modules/web/site/hybrid-connection-namespace/relay/version.json similarity index 100% rename from modules/web/site/hybrid-connection-namespace/relays/version.json rename to modules/web/site/hybrid-connection-namespace/relay/version.json diff --git a/modules/web/site/slot/config--appsettings/README.md b/modules/web/site/slot/config--appsetting/README.md similarity index 100% rename from modules/web/site/slot/config--appsettings/README.md rename to modules/web/site/slot/config--appsetting/README.md diff --git a/modules/web/site/slot/config--appsettings/main.bicep b/modules/web/site/slot/config--appsetting/main.bicep similarity index 100% rename from modules/web/site/slot/config--appsettings/main.bicep rename to modules/web/site/slot/config--appsetting/main.bicep diff --git a/modules/web/site/slot/config--appsettings/main.json b/modules/web/site/slot/config--appsetting/main.json similarity index 100% rename from modules/web/site/slot/config--appsettings/main.json rename to modules/web/site/slot/config--appsetting/main.json diff --git a/modules/web/site/slot/config--appsettings/version.json b/modules/web/site/slot/config--appsetting/version.json similarity index 100% rename from modules/web/site/slot/config--appsettings/version.json rename to modules/web/site/slot/config--appsetting/version.json diff --git a/modules/web/site/slot/hybrid-connection-namespaces/relays/README.md b/modules/web/site/slot/hybrid-connection-namespace/relays/README.md similarity index 100% rename from modules/web/site/slot/hybrid-connection-namespaces/relays/README.md rename to modules/web/site/slot/hybrid-connection-namespace/relays/README.md diff --git a/modules/web/site/slot/hybrid-connection-namespaces/relays/main.bicep b/modules/web/site/slot/hybrid-connection-namespace/relays/main.bicep similarity index 100% rename from modules/web/site/slot/hybrid-connection-namespaces/relays/main.bicep rename to modules/web/site/slot/hybrid-connection-namespace/relays/main.bicep diff --git a/modules/web/site/slot/hybrid-connection-namespaces/relays/main.json b/modules/web/site/slot/hybrid-connection-namespace/relays/main.json similarity index 100% rename from modules/web/site/slot/hybrid-connection-namespaces/relays/main.json rename to modules/web/site/slot/hybrid-connection-namespace/relays/main.json diff --git a/modules/web/site/slot/hybrid-connection-namespaces/relays/version.json b/modules/web/site/slot/hybrid-connection-namespace/relays/version.json similarity index 100% rename from modules/web/site/slot/hybrid-connection-namespaces/relays/version.json rename to modules/web/site/slot/hybrid-connection-namespace/relays/version.json From 2cb41e8d1cb8b6b9e1213ff5635314175337039f Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Fri, 11 Aug 2023 22:06:17 +0200 Subject: [PATCH 04/15] 4th run --- .../rule-collection/{rules => rule}/README.md | 0 .../rule-collection/{rules => rule}/main.bicep | 0 .../rule-collection/{rules => rule}/main.json | 0 .../rule-collection/{rules => rule}/version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../{immutability-policies => immutability-policy}/README.md | 0 .../{immutability-policies => immutability-policy}/main.bicep | 0 .../{immutability-policies => immutability-policy}/main.json | 0 .../{immutability-policies => immutability-policy}/version.json | 0 .../slot/hybrid-connection-namespace/{relays => relay}/README.md | 0 .../slot/hybrid-connection-namespace/{relays => relay}/main.bicep | 0 .../slot/hybrid-connection-namespace/{relays => relay}/main.json | 0 .../hybrid-connection-namespace/{relays => relay}/version.json | 0 16 files changed, 0 insertions(+), 0 deletions(-) rename modules/network/network-manager/security-admin-configuration/rule-collection/{rules => rule}/README.md (100%) rename modules/network/network-manager/security-admin-configuration/rule-collection/{rules => rule}/main.bicep (100%) rename modules/network/network-manager/security-admin-configuration/rule-collection/{rules => rule}/main.json (100%) rename modules/network/network-manager/security-admin-configuration/rule-collection/{rules => rule}/version.json (100%) rename modules/recovery-services/vault/replication-fabric/replication-protection-container/{replication-protection-container-mappings => replication-protection-container-mapping}/README.md (100%) rename modules/recovery-services/vault/replication-fabric/replication-protection-container/{replication-protection-container-mappings => replication-protection-container-mapping}/main.bicep (100%) rename modules/recovery-services/vault/replication-fabric/replication-protection-container/{replication-protection-container-mappings => replication-protection-container-mapping}/main.json (100%) rename modules/recovery-services/vault/replication-fabric/replication-protection-container/{replication-protection-container-mappings => replication-protection-container-mapping}/version.json (100%) rename modules/storage/storage-account/blob-service/container/{immutability-policies => immutability-policy}/README.md (100%) rename modules/storage/storage-account/blob-service/container/{immutability-policies => immutability-policy}/main.bicep (100%) rename modules/storage/storage-account/blob-service/container/{immutability-policies => immutability-policy}/main.json (100%) rename modules/storage/storage-account/blob-service/container/{immutability-policies => immutability-policy}/version.json (100%) rename modules/web/site/slot/hybrid-connection-namespace/{relays => relay}/README.md (100%) rename modules/web/site/slot/hybrid-connection-namespace/{relays => relay}/main.bicep (100%) rename modules/web/site/slot/hybrid-connection-namespace/{relays => relay}/main.json (100%) rename modules/web/site/slot/hybrid-connection-namespace/{relays => relay}/version.json (100%) diff --git a/modules/network/network-manager/security-admin-configuration/rule-collection/rules/README.md b/modules/network/network-manager/security-admin-configuration/rule-collection/rule/README.md similarity index 100% rename from modules/network/network-manager/security-admin-configuration/rule-collection/rules/README.md rename to modules/network/network-manager/security-admin-configuration/rule-collection/rule/README.md diff --git a/modules/network/network-manager/security-admin-configuration/rule-collection/rules/main.bicep b/modules/network/network-manager/security-admin-configuration/rule-collection/rule/main.bicep similarity index 100% rename from modules/network/network-manager/security-admin-configuration/rule-collection/rules/main.bicep rename to modules/network/network-manager/security-admin-configuration/rule-collection/rule/main.bicep diff --git a/modules/network/network-manager/security-admin-configuration/rule-collection/rules/main.json b/modules/network/network-manager/security-admin-configuration/rule-collection/rule/main.json similarity index 100% rename from modules/network/network-manager/security-admin-configuration/rule-collection/rules/main.json rename to modules/network/network-manager/security-admin-configuration/rule-collection/rule/main.json diff --git a/modules/network/network-manager/security-admin-configuration/rule-collection/rules/version.json b/modules/network/network-manager/security-admin-configuration/rule-collection/rule/version.json similarity index 100% rename from modules/network/network-manager/security-admin-configuration/rule-collection/rules/version.json rename to modules/network/network-manager/security-admin-configuration/rule-collection/rule/version.json diff --git a/modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mappings/README.md b/modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mapping/README.md similarity index 100% rename from modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mappings/README.md rename to modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mapping/README.md diff --git a/modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mappings/main.bicep b/modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mapping/main.bicep similarity index 100% rename from modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mappings/main.bicep rename to modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mapping/main.bicep diff --git a/modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mappings/main.json b/modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mapping/main.json similarity index 100% rename from modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mappings/main.json rename to modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mapping/main.json diff --git a/modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mappings/version.json b/modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mapping/version.json similarity index 100% rename from modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mappings/version.json rename to modules/recovery-services/vault/replication-fabric/replication-protection-container/replication-protection-container-mapping/version.json diff --git a/modules/storage/storage-account/blob-service/container/immutability-policies/README.md b/modules/storage/storage-account/blob-service/container/immutability-policy/README.md similarity index 100% rename from modules/storage/storage-account/blob-service/container/immutability-policies/README.md rename to modules/storage/storage-account/blob-service/container/immutability-policy/README.md diff --git a/modules/storage/storage-account/blob-service/container/immutability-policies/main.bicep b/modules/storage/storage-account/blob-service/container/immutability-policy/main.bicep similarity index 100% rename from modules/storage/storage-account/blob-service/container/immutability-policies/main.bicep rename to modules/storage/storage-account/blob-service/container/immutability-policy/main.bicep diff --git a/modules/storage/storage-account/blob-service/container/immutability-policies/main.json b/modules/storage/storage-account/blob-service/container/immutability-policy/main.json similarity index 100% rename from modules/storage/storage-account/blob-service/container/immutability-policies/main.json rename to modules/storage/storage-account/blob-service/container/immutability-policy/main.json diff --git a/modules/storage/storage-account/blob-service/container/immutability-policies/version.json b/modules/storage/storage-account/blob-service/container/immutability-policy/version.json similarity index 100% rename from modules/storage/storage-account/blob-service/container/immutability-policies/version.json rename to modules/storage/storage-account/blob-service/container/immutability-policy/version.json diff --git a/modules/web/site/slot/hybrid-connection-namespace/relays/README.md b/modules/web/site/slot/hybrid-connection-namespace/relay/README.md similarity index 100% rename from modules/web/site/slot/hybrid-connection-namespace/relays/README.md rename to modules/web/site/slot/hybrid-connection-namespace/relay/README.md diff --git a/modules/web/site/slot/hybrid-connection-namespace/relays/main.bicep b/modules/web/site/slot/hybrid-connection-namespace/relay/main.bicep similarity index 100% rename from modules/web/site/slot/hybrid-connection-namespace/relays/main.bicep rename to modules/web/site/slot/hybrid-connection-namespace/relay/main.bicep diff --git a/modules/web/site/slot/hybrid-connection-namespace/relays/main.json b/modules/web/site/slot/hybrid-connection-namespace/relay/main.json similarity index 100% rename from modules/web/site/slot/hybrid-connection-namespace/relays/main.json rename to modules/web/site/slot/hybrid-connection-namespace/relay/main.json diff --git a/modules/web/site/slot/hybrid-connection-namespace/relays/version.json b/modules/web/site/slot/hybrid-connection-namespace/relay/version.json similarity index 100% rename from modules/web/site/slot/hybrid-connection-namespace/relays/version.json rename to modules/web/site/slot/hybrid-connection-namespace/relay/version.json From e16746db3a5dd5cb3318541d32175e599df9ec8e Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Sun, 13 Aug 2023 11:56:02 +0200 Subject: [PATCH 05/15] convert missing folders --- Set-CARMLFoldersForPBRSingular.ps1 | 536 +++++++++--------- .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 modules/cdn/{profiles => profile}/README.md | 0 .../{profiles => profile}/endpoint/README.md | 0 .../{profiles => profile}/endpoint/main.bicep | 0 .../{profiles => profile}/endpoint/main.json | 0 .../endpoint/origin/README.md | 0 .../endpoint/origin/main.bicep | 0 .../endpoint/origin/main.json | 0 .../endpoint/origin/version.json | 0 .../endpoint/version.json | 0 modules/cdn/{profiles => profile}/main.bicep | 0 modules/cdn/{profiles => profile}/main.json | 0 .../cdn/{profiles => profile}/version.json | 0 .../.bicep/nested_roleAssignments.bicep | 0 .../.test/common/dependencies.bicep | 0 .../.test/common/main.test.bicep | 0 .../.test/main.test.bicep | 0 .../.test/min/main.test.bicep | 0 .../{factories => factory}/README.md | 0 .../integration-runtime/README.md | 0 .../integration-runtime/main.bicep | 0 .../integration-runtime/main.json | 0 .../integration-runtime/version.json | 0 .../{factories => factory}/main.bicep | 4 +- .../{factories => factory}/main.json | 0 .../managed-virtual-network/README.md | 0 .../managed-virtual-network/main.bicep | 2 +- .../managed-virtual-network/main.json | 0 .../managed-private-endpoint/README.md | 0 .../managed-private-endpoint/main.bicep | 0 .../managed-private-endpoint/main.json | 0 .../managed-private-endpoint/version.json | 0 .../managed-virtual-network/version.json | 0 .../{factories => factory}/version.json | 0 .../protection-container/README.md | 0 .../protection-container/main.bicep | 0 .../protection-container/main.json | 0 .../protected-item/README.md | 0 .../protected-item/main.bicep | 0 .../protected-item/main.json | 0 .../protected-item/version.json | 0 .../protection-container/version.json | 0 modules/recovery-services/vault/main.bicep | 2 +- 47 files changed, 274 insertions(+), 270 deletions(-) rename modules/cdn/{profiles => profile}/.bicep/nested_roleAssignments.bicep (100%) rename modules/cdn/{profiles => profile}/.test/common/dependencies.bicep (100%) rename modules/cdn/{profiles => profile}/.test/common/main.test.bicep (100%) rename modules/cdn/{profiles => profile}/.test/main.test.bicep (100%) rename modules/cdn/{profiles => profile}/README.md (100%) rename modules/cdn/{profiles => profile}/endpoint/README.md (100%) rename modules/cdn/{profiles => profile}/endpoint/main.bicep (100%) rename modules/cdn/{profiles => profile}/endpoint/main.json (100%) rename modules/cdn/{profiles => profile}/endpoint/origin/README.md (100%) rename modules/cdn/{profiles => profile}/endpoint/origin/main.bicep (100%) rename modules/cdn/{profiles => profile}/endpoint/origin/main.json (100%) rename modules/cdn/{profiles => profile}/endpoint/origin/version.json (100%) rename modules/cdn/{profiles => profile}/endpoint/version.json (100%) rename modules/cdn/{profiles => profile}/main.bicep (100%) rename modules/cdn/{profiles => profile}/main.json (100%) rename modules/cdn/{profiles => profile}/version.json (100%) rename modules/data-factory/{factories => factory}/.bicep/nested_roleAssignments.bicep (100%) rename modules/data-factory/{factories => factory}/.test/common/dependencies.bicep (100%) rename modules/data-factory/{factories => factory}/.test/common/main.test.bicep (100%) rename modules/data-factory/{factories => factory}/.test/main.test.bicep (100%) rename modules/data-factory/{factories => factory}/.test/min/main.test.bicep (100%) rename modules/data-factory/{factories => factory}/README.md (100%) rename modules/data-factory/{factories => factory}/integration-runtime/README.md (100%) rename modules/data-factory/{factories => factory}/integration-runtime/main.bicep (100%) rename modules/data-factory/{factories => factory}/integration-runtime/main.json (100%) rename modules/data-factory/{factories => factory}/integration-runtime/version.json (100%) rename modules/data-factory/{factories => factory}/main.bicep (98%) rename modules/data-factory/{factories => factory}/main.json (100%) rename modules/data-factory/{factories => factory}/managed-virtual-network/README.md (100%) rename modules/data-factory/{factories => factory}/managed-virtual-network/main.bicep (93%) rename modules/data-factory/{factories => factory}/managed-virtual-network/main.json (100%) rename modules/data-factory/{factories => factory}/managed-virtual-network/managed-private-endpoint/README.md (100%) rename modules/data-factory/{factories => factory}/managed-virtual-network/managed-private-endpoint/main.bicep (100%) rename modules/data-factory/{factories => factory}/managed-virtual-network/managed-private-endpoint/main.json (100%) rename modules/data-factory/{factories => factory}/managed-virtual-network/managed-private-endpoint/version.json (100%) rename modules/data-factory/{factories => factory}/managed-virtual-network/version.json (100%) rename modules/data-factory/{factories => factory}/version.json (100%) rename modules/recovery-services/vault/{backup-fabrics => backup-fabric}/protection-container/README.md (100%) rename modules/recovery-services/vault/{backup-fabrics => backup-fabric}/protection-container/main.bicep (100%) rename modules/recovery-services/vault/{backup-fabrics => backup-fabric}/protection-container/main.json (100%) rename modules/recovery-services/vault/{backup-fabrics => backup-fabric}/protection-container/protected-item/README.md (100%) rename modules/recovery-services/vault/{backup-fabrics => backup-fabric}/protection-container/protected-item/main.bicep (100%) rename modules/recovery-services/vault/{backup-fabrics => backup-fabric}/protection-container/protected-item/main.json (100%) rename modules/recovery-services/vault/{backup-fabrics => backup-fabric}/protection-container/protected-item/version.json (100%) rename modules/recovery-services/vault/{backup-fabrics => backup-fabric}/protection-container/version.json (100%) diff --git a/Set-CARMLFoldersForPBRSingular.ps1 b/Set-CARMLFoldersForPBRSingular.ps1 index d88da42a1e..a24fc7a431 100644 --- a/Set-CARMLFoldersForPBRSingular.ps1 +++ b/Set-CARMLFoldersForPBRSingular.ps1 @@ -54,272 +54,276 @@ function Set-CARMLFoldersForPBRSingular { [string] $UtilitiesPath = '' ) - $specialConversionHash = @{ - 'a' = 'a' - 'aaaa' = 'aaaa' - 'access-policies' = 'access-policy' - 'accounts' = 'account' - 'action-groups' = 'action-group' - 'activity-log-alerts' = 'activity-log-alert' - 'administrators' = 'administrator' - 'agent-pools' = 'agent-pool' - 'api-version-sets' = 'api-version-set' - 'apis' = 'api' - 'application-gateway-web-application-firewall-policies' = 'application-gateway-web-application-firewall-policy' - 'application-gateways' = 'application-gateway' - 'application-groups' = 'application-group' - 'application-security-groups' = 'application-security-group' - 'application-types' = 'application-type' - 'applications' = 'application' - 'artifactsources' = 'artifactsource' - 'authorization-rules' = 'authorization-rule' - 'authorization-servers' = 'authorization-server' - 'automation-accounts' = 'automation-account' - 'availability-sets' = 'availability-set' - 'azure-firewalls' = 'azure-firewall' - 'azure-security-center' = 'azure-security-center' - 'backend-address-pools' = 'backend-address-pool' - 'backends' = 'backend' - 'backup-config' = 'backup-config' - 'backup-long-term-retention-policies' = 'backup-long-term-retention-policy' - 'backup-policies' = 'backup-policy' - 'backup-short-term-retention-policies' = 'backup-short-term-retention-policy' - 'backup-storage-config' = 'backup-storage-config' - 'backup-vaults' = 'backup-vault' - 'basic-publishing-credentials-policies' = 'basic-publishing-credentials-policy' - 'bastion-hosts' = 'bastion-host' - 'batch-accounts' = 'batch-account' - 'blob-services' = 'blob-service' - 'budgets' = 'budget' - 'caa' = 'caa' - 'caches' = 'cache' - 'capacities' = 'capacity' - 'capacity-pools' = 'capacity-pool' - 'clusters' = 'cluster' - 'cname' = 'cname' - 'collections' = 'collection' - 'components' = 'component' - 'computes' = 'compute' - 'config' = 'config' - 'config--appsettings' = 'config--appsetting' - 'config--authsettingsv2' = 'config--authsettingsv2' - 'configuration-stores' = 'configuration-store' - 'configurations' = 'configuration' - 'configurations--customdnssuffix' = 'configurations--customdnssuffix' - 'configurations--networking' = 'configurations--networking' - 'connection-monitors' = 'connection-monitor' - 'connections' = 'connection' - 'connectivity-configurations' = 'connectivity-configuration' - 'consumergroups' = 'consumergroup' - 'container-apps' = 'container-app' - 'container-groups' = 'container-group' - 'containers' = 'container' - 'costs' = 'cost' - 'custom-domains' = 'custom-domain' - 'data-collection-endpoints' = 'data-collection-endpoint' - 'data-collection-rules' = 'data-collection-rule' - 'data-exports' = 'data-export' - 'data-sources' = 'data-source' - 'database-accounts' = 'database-account' - 'databases' = 'database' - 'ddos-protection-plans' = 'ddos-protection-plan' - 'deployment-scripts' = 'deployment-script' - 'diagnostic-settings' = 'diagnostic-setting' - 'dicomservices' = 'dicomservice' - 'digital-twins-instances' = 'digital-twins-instance' - 'disaster-recovery-configs' = 'disaster-recovery-config' - 'disk-encryption-sets' = 'disk-encryption-set' - 'disks' = 'disk' - 'dns-forwarding-rulesets' = 'dns-forwarding-ruleset' - 'dns-resolvers' = 'dns-resolver' - 'dns-zones' = 'dns-zone' - 'domain-services' = 'domain-service' - 'domains' = 'domain' - 'elastic-pools' = 'elastic-pool' - 'encryption-protector' = 'encryption-protector' - 'endpoints' = 'endpoint' - 'endpoints--event-grid' = 'endpoints--event-grid' - 'endpoints--event-hub' = 'endpoints--event-hub' - 'endpoints--service-bus' = 'endpoints--service-bus' - 'eventhubs' = 'eventhub' - 'eventSubscriptions' = 'eventSubscription' - 'express-route-circuits' = 'express-route-circuit' - 'express-route-gateway' = 'express-route-gateway' - 'extensions' = 'extension' - 'factories' = 'factory' - 'fhirdestinations' = 'fhirdestination' - 'fhirservices' = 'fhirservice' - 'file-services' = 'file-service' - 'firewall-policies' = 'firewall-policy' - 'firewall-rules' = 'firewall-rule' - 'flexible-servers' = 'flexible-server' - 'flow-logs' = 'flow-log' - 'flux-configurations' = 'flux-configuration' - 'forwarding-rules' = 'forwarding-rule' - 'front-doors' = 'front-door' - 'galleries' = 'gallery' - 'graphs' = 'graph' - 'gremlin-databases' = 'gremlin-database' - 'groups' = 'group' - 'health-bots' = 'health-bot' - 'host-pools' = 'host-pool' - 'hosting-environments' = 'hosting-environment' - 'hub-route-tables' = 'hub-route-table' - 'hub-virtual-network-connections' = 'hub-virtual-network-connection' - 'hybrid-connections' = 'hybrid-connection' - 'hybrid-connection-namespaces' = 'hybrid-connection-namespace' - 'identity-providers' = 'identity-provider' - 'image-templates' = 'image-template' - 'images' = 'image' - 'immutability-policies' = 'immutability-policy' - 'inbound-nat-rules' = 'inbound-nat-rule' - 'integration-runtimes' = 'integration-runtime' - 'iotconnectors' = 'iotconnector' - 'ip-groups' = 'ip-group' - 'job-schedules' = 'job-schedule' - 'key-values' = 'key-value' - 'keys' = 'key' - 'labs' = 'lab' - 'linked-backends' = 'linked-backend' - 'linked-services' = 'linked-service' - 'linked-storage-accounts' = 'linked-storage-account' - 'load-balancers' = 'load-balancer' - 'local-network-gateways' = 'local-network-gateway' - 'local-users' = 'local-user' - 'locks' = 'lock' - 'maintenance-configurations' = 'maintenance-configuration' - 'managed-clusters' = 'managed-cluster' - 'managed-environments' = 'managed-environment' - 'managed-instances' = 'managed-instance' - 'managed-private-endpoints' = 'managed-private-endpoint' - 'managed-virtual-networks' = 'managed-virtual-network' - 'management-group' = 'management-group' - 'management-groups' = 'management-group' - 'management-policies' = 'management-policy' - 'metric-alerts' = 'metric-alert' - 'migration-configurations' = 'migration-configuration' - 'modules' = 'module' - 'mongodb-databases' = 'mongodb-database' - 'mx' = 'mx' - 'named-values' = 'named-value' - 'namespaces' = 'namespace' - 'nat-gateways' = 'nat-gateway' - 'nat-rules' = 'nat-rule' - 'net-app-accounts' = 'net-app-account' - 'network-groups' = 'network-group' - 'network-interfaces' = 'network-interface' - 'network-managers' = 'network-manager' - 'network-rule-sets' = 'network-rule-set' - 'network-security-groups' = 'network-security-group' - 'network-watchers' = 'network-watcher' - 'notificationchannels' = 'notificationchannel' - 'ns' = 'ns' - 'origins' = 'origin' - 'policies' = 'policy' - 'policy-assignments' = 'policy-assignment' - 'policy-definitions' = 'policy-definition' - 'policy-exemptions' = 'policy-exemption' - 'policy-set-definitions' = 'policy-set-definition' - 'policysets' = 'policyset' - 'portalsettings' = 'portalsetting' - 'private-dns-zone-groups' = 'private-dns-zone-group' - 'private-dns-zones' = 'private-dns-zone' - 'private-endpoints' = 'private-endpoint' - 'private-link-hubs' = 'private-link-hub' - 'private-link-scopes' = 'private-link-scope' - 'private-link-services' = 'private-link-service' - 'products' = 'product' - 'profiles' = 'profile' - 'protected-items' = 'protected-item' - 'protection-containers' = 'protection-container' - 'proximity-placement-groups' = 'proximity-placement-group' - 'ptr' = 'ptr' - 'public-ip-addresses' = 'public-ip-address' - 'public-ip-prefixes' = 'public-ip-prefix' - 'queue-services' = 'queue-service' - 'queues' = 'queue' - 'redis' = 'redis' - 'registration-definitions' = 'registration-definition' - 'registries' = 'registry' - 'relays' = 'relay' - 'remediations' = 'remediation' - 'replication-alert-settings' = 'replication-alert-setting' - 'replication-fabrics' = 'replication-fabric' - 'replication-policies' = 'replication-policy' - 'replication-protection-container-mappings' = 'replication-protection-container-mapping' - 'replication-protection-containers' = 'replication-protection-container' - 'replications' = 'replication' - 'resource-group' = 'resource-group' - 'resource-groups' = 'resource-group' - 'role-assignments' = 'role-assignment' - 'role-definitions' = 'role-definition' - 'route-tables' = 'route-table' - 'rule-collection-groups' = 'rule-collection-group' - 'rule-collections' = 'rule-collection' - 'rules' = 'rule' - 'runbooks' = 'runbook' - 'saved-searches' = 'saved-searche' - 'scaling-plans' = 'scaling-plan' - 'scheduled-query-rules' = 'scheduled-query-rule' - 'schedules' = 'schedule' - 'scope-connections' = 'scope-connection' - 'scoped-resources' = 'scoped-resource' - 'secrets' = 'secret' - 'security-admin-configurations' = 'security-admin-configuration' - 'security-alert-policies' = 'security-alert-policy' - 'security-rules' = 'security-rule' - 'serverfarms' = 'serverfarm' - 'servers' = 'server' - 'service' = 'service' - 'service-endpoint-policies' = 'service-endpoint-policy' - 'shares' = 'share' - 'signal-r' = 'signal-r' - 'sites' = 'site' - 'slots' = 'slot' - 'soa' = 'soa' - 'software-update-configurations' = 'software-update-configuration' - 'solutions' = 'solution' - 'sql-databases' = 'sql-database' - 'srv' = 'srv' - 'ssh-public-keys' = 'ssh-public-key' - 'static-members' = 'static-member' - 'static-sites' = 'static-site' - 'storage-accounts' = 'storage-account' - 'storage-insight-configs' = 'storage-insight-config' - 'subnets' = 'subnet' - 'subscription' = 'subscription' - 'subscriptions' = 'subscription' - 'system-topics' = 'system-topic' - 'table-services' = 'table-service' - 'tables' = 'table' - 'tags' = 'tags' - 'topics' = 'topic' - 'trafficmanagerprofiles' = 'trafficmanagerprofile' - 'txt' = 'txt' - 'user-assigned-identities' = 'user-assigned-identity' - 'variables' = 'variable' - 'vaults' = 'vault' - 'virtual-hubs' = 'virtual-hub' - 'virtual-machine-scale-sets' = 'virtual-machine-scale-set' - 'virtual-machines' = 'virtual-machine' - 'virtual-network-gateways' = 'virtual-network-gateway' - 'virtual-network-links' = 'virtual-network-link' - 'virtual-network-peerings' = 'virtual-network-peering' - 'virtual-network-rules' = 'virtual-network-rule' - 'virtual-networks' = 'virtual-network' - 'virtual-wans' = 'virtual-wan' - 'virtualnetworks' = 'virtualnetwork' - 'volumes' = 'volume' - 'vpn-gateways' = 'vpn-gateway' - 'vpn-sites' = 'vpn-site' - 'vulnerability-assessments' = 'vulnerability-assessment' - 'wcf-relays' = 'wcf-relay' - 'web-pub-sub' = 'web-pub-sub' - 'webhooks' = 'webhook' - 'webtests' = 'webtest' - 'workflows' = 'workflow' - 'workspaces' = 'workspace' - } + # $specialConversionHash = @{ + # 'a' = 'a' + # 'aaaa' = 'aaaa' + # 'access-policies' = 'access-policy' + # 'accounts' = 'account' + # 'action-groups' = 'action-group' + # 'activity-log-alerts' = 'activity-log-alert' + # 'administrators' = 'administrator' + # 'agent-pools' = 'agent-pool' + # 'api-version-sets' = 'api-version-set' + # 'apis' = 'api' + # 'application-gateway-web-application-firewall-policies' = 'application-gateway-web-application-firewall-policy' + # 'application-gateways' = 'application-gateway' + # 'application-groups' = 'application-group' + # 'application-security-groups' = 'application-security-group' + # 'application-types' = 'application-type' + # 'applications' = 'application' + # 'artifactsources' = 'artifactsource' + # 'authorization-rules' = 'authorization-rule' + # 'authorization-servers' = 'authorization-server' + # 'automation-accounts' = 'automation-account' + # 'availability-sets' = 'availability-set' + # 'azure-firewalls' = 'azure-firewall' + # 'azure-security-center' = 'azure-security-center' + # 'backend-address-pools' = 'backend-address-pool' + # 'backends' = 'backend' + # 'backup-config' = 'backup-config' + # 'backup-long-term-retention-policies' = 'backup-long-term-retention-policy' + # 'backup-fabrics' = 'backup-fabric' + # 'backup-policies' = 'backup-policy' + # 'backup-short-term-retention-policies' = 'backup-short-term-retention-policy' + # 'backup-storage-config' = 'backup-storage-config' + # 'backup-vaults' = 'backup-vault' + # 'basic-publishing-credentials-policies' = 'basic-publishing-credentials-policy' + # 'bastion-hosts' = 'bastion-host' + # 'batch-accounts' = 'batch-account' + # 'blob-services' = 'blob-service' + # 'budgets' = 'budget' + # 'caa' = 'caa' + # 'caches' = 'cache' + # 'capacities' = 'capacity' + # 'capacity-pools' = 'capacity-pool' + # 'clusters' = 'cluster' + # 'cname' = 'cname' + # 'collections' = 'collection' + # 'components' = 'component' + # 'computes' = 'compute' + # 'config' = 'config' + # 'config--appsettings' = 'config--appsetting' + # 'config--authsettingsv2' = 'config--authsettingsv2' + # 'configuration-stores' = 'configuration-store' + # 'configurations' = 'configuration' + # 'configurations--customdnssuffix' = 'configurations--customdnssuffix' + # 'configurations--networking' = 'configurations--networking' + # 'connection-monitors' = 'connection-monitor' + # 'connections' = 'connection' + # 'connectivity-configurations' = 'connectivity-configuration' + # 'consumergroups' = 'consumergroup' + # 'container-apps' = 'container-app' + # 'container-groups' = 'container-group' + # 'containers' = 'container' + # 'costs' = 'cost' + # 'custom-domains' = 'custom-domain' + # 'data-collection-endpoints' = 'data-collection-endpoint' + # 'data-collection-rules' = 'data-collection-rule' + # 'data-exports' = 'data-export' + # 'data-sources' = 'data-source' + # 'database-accounts' = 'database-account' + # 'databases' = 'database' + # 'ddos-protection-plans' = 'ddos-protection-plan' + # 'deployment-scripts' = 'deployment-script' + # 'diagnostic-settings' = 'diagnostic-setting' + # 'dicomservices' = 'dicomservice' + # 'digital-twins-instances' = 'digital-twins-instance' + # 'disaster-recovery-configs' = 'disaster-recovery-config' + # 'disk-encryption-sets' = 'disk-encryption-set' + # 'disks' = 'disk' + # 'dns-forwarding-rulesets' = 'dns-forwarding-ruleset' + # 'dns-resolvers' = 'dns-resolver' + # 'dns-zones' = 'dns-zone' + # 'domain-services' = 'domain-service' + # 'domains' = 'domain' + # 'elastic-pools' = 'elastic-pool' + # 'encryption-protector' = 'encryption-protector' + # 'endpoints' = 'endpoint' + # 'endpoints--event-grid' = 'endpoints--event-grid' + # 'endpoints--event-hub' = 'endpoints--event-hub' + # 'endpoints--service-bus' = 'endpoints--service-bus' + # 'eventhubs' = 'eventhub' + # 'eventSubscriptions' = 'eventSubscription' + # 'express-route-circuits' = 'express-route-circuit' + # 'express-route-gateway' = 'express-route-gateway' + # 'extensions' = 'extension' + # 'factories' = 'factory' + # 'fhirdestinations' = 'fhirdestination' + # 'fhirservices' = 'fhirservice' + # 'file-services' = 'file-service' + # 'firewall-policies' = 'firewall-policy' + # 'firewall-rules' = 'firewall-rule' + # 'flexible-servers' = 'flexible-server' + # 'flow-logs' = 'flow-log' + # 'flux-configurations' = 'flux-configuration' + # 'forwarding-rules' = 'forwarding-rule' + # 'front-doors' = 'front-door' + # 'galleries' = 'gallery' + # 'graphs' = 'graph' + # 'gremlin-databases' = 'gremlin-database' + # 'groups' = 'group' + # 'health-bots' = 'health-bot' + # 'host-pools' = 'host-pool' + # 'hosting-environments' = 'hosting-environment' + # 'hub-route-tables' = 'hub-route-table' + # 'hub-virtual-network-connections' = 'hub-virtual-network-connection' + # 'hybrid-connections' = 'hybrid-connection' + # 'hybrid-connection-namespaces' = 'hybrid-connection-namespace' + # 'identity-providers' = 'identity-provider' + # 'image-templates' = 'image-template' + # 'images' = 'image' + # 'immutability-policies' = 'immutability-policy' + # 'inbound-nat-rules' = 'inbound-nat-rule' + # 'integration-runtimes' = 'integration-runtime' + # 'iotconnectors' = 'iotconnector' + # 'ip-groups' = 'ip-group' + # 'job-schedules' = 'job-schedule' + # 'key-values' = 'key-value' + # 'keys' = 'key' + # 'labs' = 'lab' + # 'linked-backends' = 'linked-backend' + # 'linked-services' = 'linked-service' + # 'linked-storage-accounts' = 'linked-storage-account' + # 'load-balancers' = 'load-balancer' + # 'local-network-gateways' = 'local-network-gateway' + # 'local-users' = 'local-user' + # 'locks' = 'lock' + # 'maintenance-configurations' = 'maintenance-configuration' + # 'managed-clusters' = 'managed-cluster' + # 'managed-environments' = 'managed-environment' + # 'managed-instances' = 'managed-instance' + # 'managed-private-endpoints' = 'managed-private-endpoint' + # 'managed-virtual-networks' = 'managed-virtual-network' + # 'management-group' = 'management-group' + # 'management-groups' = 'management-group' + # 'management-policies' = 'management-policy' + # 'metric-alerts' = 'metric-alert' + # 'migration-configurations' = 'migration-configuration' + # 'modules' = 'module' + # 'mongodb-databases' = 'mongodb-database' + # 'mx' = 'mx' + # 'named-values' = 'named-value' + # 'namespaces' = 'namespace' + # 'nat-gateways' = 'nat-gateway' + # 'nat-rules' = 'nat-rule' + # 'net-app-accounts' = 'net-app-account' + # 'network-groups' = 'network-group' + # 'network-interfaces' = 'network-interface' + # 'network-managers' = 'network-manager' + # 'network-rule-sets' = 'network-rule-set' + # 'network-security-groups' = 'network-security-group' + # 'network-watchers' = 'network-watcher' + # 'notificationchannels' = 'notificationchannel' + # 'ns' = 'ns' + # 'origins' = 'origin' + # 'policies' = 'policy' + # 'policy-assignments' = 'policy-assignment' + # 'policy-definitions' = 'policy-definition' + # 'policy-exemptions' = 'policy-exemption' + # 'policy-set-definitions' = 'policy-set-definition' + # 'policysets' = 'policyset' + # 'portalsettings' = 'portalsetting' + # 'private-dns-zone-groups' = 'private-dns-zone-group' + # 'private-dns-zones' = 'private-dns-zone' + # 'private-endpoints' = 'private-endpoint' + # 'private-link-hubs' = 'private-link-hub' + # 'private-link-scopes' = 'private-link-scope' + # 'private-link-services' = 'private-link-service' + # 'products' = 'product' + # 'profiles' = 'profile' + # 'protected-items' = 'protected-item' + # 'protection-containers' = 'protection-container' + # 'proximity-placement-groups' = 'proximity-placement-group' + # 'ptr' = 'ptr' + # 'public-ip-addresses' = 'public-ip-address' + # 'public-ip-prefixes' = 'public-ip-prefix' + # 'queue-services' = 'queue-service' + # 'queues' = 'queue' + # 'redis' = 'redis' + # 'registration-definitions' = 'registration-definition' + # 'registries' = 'registry' + # 'relays' = 'relay' + # 'remediations' = 'remediation' + # 'replication-alert-settings' = 'replication-alert-setting' + # 'replication-fabrics' = 'replication-fabric' + # 'replication-policies' = 'replication-policy' + # 'replication-protection-container-mappings' = 'replication-protection-container-mapping' + # 'replication-protection-containers' = 'replication-protection-container' + # 'replications' = 'replication' + # 'resource-group' = 'resource-group' + # 'resource-groups' = 'resource-group' + # 'role-assignments' = 'role-assignment' + # 'role-definitions' = 'role-definition' + # 'route-tables' = 'route-table' + # 'rule-collection-groups' = 'rule-collection-group' + # 'rule-collections' = 'rule-collection' + # 'rules' = 'rule' + # 'runbooks' = 'runbook' + # 'saved-searches' = 'saved-searche' + # 'scaling-plans' = 'scaling-plan' + # 'scheduled-query-rules' = 'scheduled-query-rule' + # 'schedules' = 'schedule' + # 'scope-connections' = 'scope-connection' + # 'scoped-resources' = 'scoped-resource' + # 'secrets' = 'secret' + # 'security-admin-configurations' = 'security-admin-configuration' + # 'security-alert-policies' = 'security-alert-policy' + # 'security-rules' = 'security-rule' + # 'serverfarms' = 'serverfarm' + # 'servers' = 'server' + # 'service' = 'service' + # 'service-endpoint-policies' = 'service-endpoint-policy' + # 'shares' = 'share' + # 'signal-r' = 'signal-r' + # 'sites' = 'site' + # 'slots' = 'slot' + # 'soa' = 'soa' + # 'software-update-configurations' = 'software-update-configuration' + # 'solutions' = 'solution' + # 'sql-databases' = 'sql-database' + # 'srv' = 'srv' + # 'ssh-public-keys' = 'ssh-public-key' + # 'static-members' = 'static-member' + # 'static-sites' = 'static-site' + # 'storage-accounts' = 'storage-account' + # 'storage-insight-configs' = 'storage-insight-config' + # 'subnets' = 'subnet' + # 'subscription' = 'subscription' + # 'subscriptions' = 'subscription' + # 'system-topics' = 'system-topic' + # 'table-services' = 'table-service' + # 'tables' = 'table' + # 'tags' = 'tags' + # 'topics' = 'topic' + # 'trafficmanagerprofiles' = 'trafficmanagerprofile' + # 'txt' = 'txt' + # 'user-assigned-identities' = 'user-assigned-identity' + # 'variables' = 'variable' + # 'vaults' = 'vault' + # 'virtual-hubs' = 'virtual-hub' + # 'virtual-machine-scale-sets' = 'virtual-machine-scale-set' + # 'virtual-machines' = 'virtual-machine' + # 'virtual-network-gateways' = 'virtual-network-gateway' + # 'virtual-network-links' = 'virtual-network-link' + # 'virtual-network-peerings' = 'virtual-network-peering' + # 'virtual-network-rules' = 'virtual-network-rule' + # 'virtual-networks' = 'virtual-network' + # 'virtual-wans' = 'virtual-wan' + # 'virtualnetworks' = 'virtualnetwork' + # 'volumes' = 'volume' + # 'vpn-gateways' = 'vpn-gateway' + # 'vpn-sites' = 'vpn-site' + # 'vulnerability-assessments' = 'vulnerability-assessment' + # 'wcf-relays' = 'wcf-relay' + # 'web-pub-sub' = 'web-pub-sub' + # 'webhooks' = 'webhook' + # 'webtests' = 'webtest' + # 'workflows' = 'workflow' + # 'workspaces' = 'workspace' + # } + + $jsonFile = Join-Path $PSScriptRoot '\rtMapping.jsonc' + $specialConversionHash = Get-Content -Raw $jsonFile | ConvertFrom-Json -AsHashtable $relevantFolderPaths = @() # Get all module folder names diff --git a/modules/cdn/profiles/.bicep/nested_roleAssignments.bicep b/modules/cdn/profile/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/cdn/profiles/.bicep/nested_roleAssignments.bicep rename to modules/cdn/profile/.bicep/nested_roleAssignments.bicep diff --git a/modules/cdn/profiles/.test/common/dependencies.bicep b/modules/cdn/profile/.test/common/dependencies.bicep similarity index 100% rename from modules/cdn/profiles/.test/common/dependencies.bicep rename to modules/cdn/profile/.test/common/dependencies.bicep diff --git a/modules/cdn/profiles/.test/common/main.test.bicep b/modules/cdn/profile/.test/common/main.test.bicep similarity index 100% rename from modules/cdn/profiles/.test/common/main.test.bicep rename to modules/cdn/profile/.test/common/main.test.bicep diff --git a/modules/cdn/profiles/.test/main.test.bicep b/modules/cdn/profile/.test/main.test.bicep similarity index 100% rename from modules/cdn/profiles/.test/main.test.bicep rename to modules/cdn/profile/.test/main.test.bicep diff --git a/modules/cdn/profiles/README.md b/modules/cdn/profile/README.md similarity index 100% rename from modules/cdn/profiles/README.md rename to modules/cdn/profile/README.md diff --git a/modules/cdn/profiles/endpoint/README.md b/modules/cdn/profile/endpoint/README.md similarity index 100% rename from modules/cdn/profiles/endpoint/README.md rename to modules/cdn/profile/endpoint/README.md diff --git a/modules/cdn/profiles/endpoint/main.bicep b/modules/cdn/profile/endpoint/main.bicep similarity index 100% rename from modules/cdn/profiles/endpoint/main.bicep rename to modules/cdn/profile/endpoint/main.bicep diff --git a/modules/cdn/profiles/endpoint/main.json b/modules/cdn/profile/endpoint/main.json similarity index 100% rename from modules/cdn/profiles/endpoint/main.json rename to modules/cdn/profile/endpoint/main.json diff --git a/modules/cdn/profiles/endpoint/origin/README.md b/modules/cdn/profile/endpoint/origin/README.md similarity index 100% rename from modules/cdn/profiles/endpoint/origin/README.md rename to modules/cdn/profile/endpoint/origin/README.md diff --git a/modules/cdn/profiles/endpoint/origin/main.bicep b/modules/cdn/profile/endpoint/origin/main.bicep similarity index 100% rename from modules/cdn/profiles/endpoint/origin/main.bicep rename to modules/cdn/profile/endpoint/origin/main.bicep diff --git a/modules/cdn/profiles/endpoint/origin/main.json b/modules/cdn/profile/endpoint/origin/main.json similarity index 100% rename from modules/cdn/profiles/endpoint/origin/main.json rename to modules/cdn/profile/endpoint/origin/main.json diff --git a/modules/cdn/profiles/endpoint/origin/version.json b/modules/cdn/profile/endpoint/origin/version.json similarity index 100% rename from modules/cdn/profiles/endpoint/origin/version.json rename to modules/cdn/profile/endpoint/origin/version.json diff --git a/modules/cdn/profiles/endpoint/version.json b/modules/cdn/profile/endpoint/version.json similarity index 100% rename from modules/cdn/profiles/endpoint/version.json rename to modules/cdn/profile/endpoint/version.json diff --git a/modules/cdn/profiles/main.bicep b/modules/cdn/profile/main.bicep similarity index 100% rename from modules/cdn/profiles/main.bicep rename to modules/cdn/profile/main.bicep diff --git a/modules/cdn/profiles/main.json b/modules/cdn/profile/main.json similarity index 100% rename from modules/cdn/profiles/main.json rename to modules/cdn/profile/main.json diff --git a/modules/cdn/profiles/version.json b/modules/cdn/profile/version.json similarity index 100% rename from modules/cdn/profiles/version.json rename to modules/cdn/profile/version.json diff --git a/modules/data-factory/factories/.bicep/nested_roleAssignments.bicep b/modules/data-factory/factory/.bicep/nested_roleAssignments.bicep similarity index 100% rename from modules/data-factory/factories/.bicep/nested_roleAssignments.bicep rename to modules/data-factory/factory/.bicep/nested_roleAssignments.bicep diff --git a/modules/data-factory/factories/.test/common/dependencies.bicep b/modules/data-factory/factory/.test/common/dependencies.bicep similarity index 100% rename from modules/data-factory/factories/.test/common/dependencies.bicep rename to modules/data-factory/factory/.test/common/dependencies.bicep diff --git a/modules/data-factory/factories/.test/common/main.test.bicep b/modules/data-factory/factory/.test/common/main.test.bicep similarity index 100% rename from modules/data-factory/factories/.test/common/main.test.bicep rename to modules/data-factory/factory/.test/common/main.test.bicep diff --git a/modules/data-factory/factories/.test/main.test.bicep b/modules/data-factory/factory/.test/main.test.bicep similarity index 100% rename from modules/data-factory/factories/.test/main.test.bicep rename to modules/data-factory/factory/.test/main.test.bicep diff --git a/modules/data-factory/factories/.test/min/main.test.bicep b/modules/data-factory/factory/.test/min/main.test.bicep similarity index 100% rename from modules/data-factory/factories/.test/min/main.test.bicep rename to modules/data-factory/factory/.test/min/main.test.bicep diff --git a/modules/data-factory/factories/README.md b/modules/data-factory/factory/README.md similarity index 100% rename from modules/data-factory/factories/README.md rename to modules/data-factory/factory/README.md diff --git a/modules/data-factory/factories/integration-runtime/README.md b/modules/data-factory/factory/integration-runtime/README.md similarity index 100% rename from modules/data-factory/factories/integration-runtime/README.md rename to modules/data-factory/factory/integration-runtime/README.md diff --git a/modules/data-factory/factories/integration-runtime/main.bicep b/modules/data-factory/factory/integration-runtime/main.bicep similarity index 100% rename from modules/data-factory/factories/integration-runtime/main.bicep rename to modules/data-factory/factory/integration-runtime/main.bicep diff --git a/modules/data-factory/factories/integration-runtime/main.json b/modules/data-factory/factory/integration-runtime/main.json similarity index 100% rename from modules/data-factory/factories/integration-runtime/main.json rename to modules/data-factory/factory/integration-runtime/main.json diff --git a/modules/data-factory/factories/integration-runtime/version.json b/modules/data-factory/factory/integration-runtime/version.json similarity index 100% rename from modules/data-factory/factories/integration-runtime/version.json rename to modules/data-factory/factory/integration-runtime/version.json diff --git a/modules/data-factory/factories/main.bicep b/modules/data-factory/factory/main.bicep similarity index 98% rename from modules/data-factory/factories/main.bicep rename to modules/data-factory/factory/main.bicep index f4a7ae7072..934a3cf37b 100644 --- a/modules/data-factory/factories/main.bicep +++ b/modules/data-factory/factory/main.bicep @@ -225,7 +225,7 @@ resource dataFactory 'Microsoft.DataFactory/factories@2018-06-01' = { } } -module dataFactory_managedVirtualNetwork 'managed-virtual-network/main.bicep' = if (!empty(managedVirtualNetworkName)) { +module dataFactory_managedVirtualNetwork '/main.bicep' = if (!empty(managedVirtualNetworkName)) { name: '${uniqueString(deployment().name, location)}-DataFactory-ManagedVNet' params: { name: managedVirtualNetworkName @@ -235,7 +235,7 @@ module dataFactory_managedVirtualNetwork 'managed-virtual-network/main.bicep' = } } -module dataFactory_integrationRuntimes 'integration-runtime/main.bicep' = [for (integrationRuntime, index) in integrationRuntimes: { +module dataFactory_integrationRuntimes '/main.bicep' = [for (integrationRuntime, index) in integrationRuntimes: { name: '${uniqueString(deployment().name, location)}-DataFactory-IntegrationRuntime-${index}' params: { dataFactoryName: dataFactory.name diff --git a/modules/data-factory/factories/main.json b/modules/data-factory/factory/main.json similarity index 100% rename from modules/data-factory/factories/main.json rename to modules/data-factory/factory/main.json diff --git a/modules/data-factory/factories/managed-virtual-network/README.md b/modules/data-factory/factory/managed-virtual-network/README.md similarity index 100% rename from modules/data-factory/factories/managed-virtual-network/README.md rename to modules/data-factory/factory/managed-virtual-network/README.md diff --git a/modules/data-factory/factories/managed-virtual-network/main.bicep b/modules/data-factory/factory/managed-virtual-network/main.bicep similarity index 93% rename from modules/data-factory/factories/managed-virtual-network/main.bicep rename to modules/data-factory/factory/managed-virtual-network/main.bicep index 61e71c1ea7..0ca6924f70 100644 --- a/modules/data-factory/factories/managed-virtual-network/main.bicep +++ b/modules/data-factory/factory/managed-virtual-network/main.bicep @@ -38,7 +38,7 @@ resource managedVirtualNetwork 'Microsoft.DataFactory/factories/managedVirtualNe properties: {} } -module managedVirtualNetwork_managedPrivateEndpoint 'managed-private-endpoint/main.bicep' = [for (managedPrivateEndpoint, index) in managedPrivateEndpoints: { +module managedVirtualNetwork_managedPrivateEndpoint '/main.bicep' = [for (managedPrivateEndpoint, index) in managedPrivateEndpoints: { name: '${deployment().name}-managedPrivateEndpoint-${index}' params: { dataFactoryName: dataFactoryName diff --git a/modules/data-factory/factories/managed-virtual-network/main.json b/modules/data-factory/factory/managed-virtual-network/main.json similarity index 100% rename from modules/data-factory/factories/managed-virtual-network/main.json rename to modules/data-factory/factory/managed-virtual-network/main.json diff --git a/modules/data-factory/factories/managed-virtual-network/managed-private-endpoint/README.md b/modules/data-factory/factory/managed-virtual-network/managed-private-endpoint/README.md similarity index 100% rename from modules/data-factory/factories/managed-virtual-network/managed-private-endpoint/README.md rename to modules/data-factory/factory/managed-virtual-network/managed-private-endpoint/README.md diff --git a/modules/data-factory/factories/managed-virtual-network/managed-private-endpoint/main.bicep b/modules/data-factory/factory/managed-virtual-network/managed-private-endpoint/main.bicep similarity index 100% rename from modules/data-factory/factories/managed-virtual-network/managed-private-endpoint/main.bicep rename to modules/data-factory/factory/managed-virtual-network/managed-private-endpoint/main.bicep diff --git a/modules/data-factory/factories/managed-virtual-network/managed-private-endpoint/main.json b/modules/data-factory/factory/managed-virtual-network/managed-private-endpoint/main.json similarity index 100% rename from modules/data-factory/factories/managed-virtual-network/managed-private-endpoint/main.json rename to modules/data-factory/factory/managed-virtual-network/managed-private-endpoint/main.json diff --git a/modules/data-factory/factories/managed-virtual-network/managed-private-endpoint/version.json b/modules/data-factory/factory/managed-virtual-network/managed-private-endpoint/version.json similarity index 100% rename from modules/data-factory/factories/managed-virtual-network/managed-private-endpoint/version.json rename to modules/data-factory/factory/managed-virtual-network/managed-private-endpoint/version.json diff --git a/modules/data-factory/factories/managed-virtual-network/version.json b/modules/data-factory/factory/managed-virtual-network/version.json similarity index 100% rename from modules/data-factory/factories/managed-virtual-network/version.json rename to modules/data-factory/factory/managed-virtual-network/version.json diff --git a/modules/data-factory/factories/version.json b/modules/data-factory/factory/version.json similarity index 100% rename from modules/data-factory/factories/version.json rename to modules/data-factory/factory/version.json diff --git a/modules/recovery-services/vault/backup-fabrics/protection-container/README.md b/modules/recovery-services/vault/backup-fabric/protection-container/README.md similarity index 100% rename from modules/recovery-services/vault/backup-fabrics/protection-container/README.md rename to modules/recovery-services/vault/backup-fabric/protection-container/README.md diff --git a/modules/recovery-services/vault/backup-fabrics/protection-container/main.bicep b/modules/recovery-services/vault/backup-fabric/protection-container/main.bicep similarity index 100% rename from modules/recovery-services/vault/backup-fabrics/protection-container/main.bicep rename to modules/recovery-services/vault/backup-fabric/protection-container/main.bicep diff --git a/modules/recovery-services/vault/backup-fabrics/protection-container/main.json b/modules/recovery-services/vault/backup-fabric/protection-container/main.json similarity index 100% rename from modules/recovery-services/vault/backup-fabrics/protection-container/main.json rename to modules/recovery-services/vault/backup-fabric/protection-container/main.json diff --git a/modules/recovery-services/vault/backup-fabrics/protection-container/protected-item/README.md b/modules/recovery-services/vault/backup-fabric/protection-container/protected-item/README.md similarity index 100% rename from modules/recovery-services/vault/backup-fabrics/protection-container/protected-item/README.md rename to modules/recovery-services/vault/backup-fabric/protection-container/protected-item/README.md diff --git a/modules/recovery-services/vault/backup-fabrics/protection-container/protected-item/main.bicep b/modules/recovery-services/vault/backup-fabric/protection-container/protected-item/main.bicep similarity index 100% rename from modules/recovery-services/vault/backup-fabrics/protection-container/protected-item/main.bicep rename to modules/recovery-services/vault/backup-fabric/protection-container/protected-item/main.bicep diff --git a/modules/recovery-services/vault/backup-fabrics/protection-container/protected-item/main.json b/modules/recovery-services/vault/backup-fabric/protection-container/protected-item/main.json similarity index 100% rename from modules/recovery-services/vault/backup-fabrics/protection-container/protected-item/main.json rename to modules/recovery-services/vault/backup-fabric/protection-container/protected-item/main.json diff --git a/modules/recovery-services/vault/backup-fabrics/protection-container/protected-item/version.json b/modules/recovery-services/vault/backup-fabric/protection-container/protected-item/version.json similarity index 100% rename from modules/recovery-services/vault/backup-fabrics/protection-container/protected-item/version.json rename to modules/recovery-services/vault/backup-fabric/protection-container/protected-item/version.json diff --git a/modules/recovery-services/vault/backup-fabrics/protection-container/version.json b/modules/recovery-services/vault/backup-fabric/protection-container/version.json similarity index 100% rename from modules/recovery-services/vault/backup-fabrics/protection-container/version.json rename to modules/recovery-services/vault/backup-fabric/protection-container/version.json diff --git a/modules/recovery-services/vault/main.bicep b/modules/recovery-services/vault/main.bicep index e84ff6015f..0bdd7f612a 100644 --- a/modules/recovery-services/vault/main.bicep +++ b/modules/recovery-services/vault/main.bicep @@ -226,7 +226,7 @@ module rsv_backupStorageConfiguration 'backup-storage-config/main.bicep' = if (! } } -module rsv_backupFabric_protectionContainers 'backup-fabrics/protection-container/main.bicep' = [for (protectionContainer, index) in protectionContainers: { +module rsv_backupFabric_protectionContainers 'backup-fabric/protection-container/main.bicep' = [for (protectionContainer, index) in protectionContainers: { name: '${uniqueString(deployment().name, location)}-RSV-ProtectionContainers-${index}' params: { recoveryVaultName: rsv.name From fb18186414c9360f0444bd52302eedbfa7169187 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Sun, 13 Aug 2023 11:58:26 +0200 Subject: [PATCH 06/15] update script --- Set-CARMLFoldersForPBRSingular.ps1 | 276 +---------------------------- 1 file changed, 5 insertions(+), 271 deletions(-) diff --git a/Set-CARMLFoldersForPBRSingular.ps1 b/Set-CARMLFoldersForPBRSingular.ps1 index a24fc7a431..4fbd502af6 100644 --- a/Set-CARMLFoldersForPBRSingular.ps1 +++ b/Set-CARMLFoldersForPBRSingular.ps1 @@ -51,279 +51,13 @@ function Set-CARMLFoldersForPBRSingular { [string] $PipelinesPath = '', [Parameter(Mandatory = $false)] - [string] $UtilitiesPath = '' + [string] $UtilitiesPath = '', + + [Parameter(Mandatory = $false)] + [string] $ConversionFilePath = (Join-Path $PSScriptRoot '\rtMapping.jsonc') ) - # $specialConversionHash = @{ - # 'a' = 'a' - # 'aaaa' = 'aaaa' - # 'access-policies' = 'access-policy' - # 'accounts' = 'account' - # 'action-groups' = 'action-group' - # 'activity-log-alerts' = 'activity-log-alert' - # 'administrators' = 'administrator' - # 'agent-pools' = 'agent-pool' - # 'api-version-sets' = 'api-version-set' - # 'apis' = 'api' - # 'application-gateway-web-application-firewall-policies' = 'application-gateway-web-application-firewall-policy' - # 'application-gateways' = 'application-gateway' - # 'application-groups' = 'application-group' - # 'application-security-groups' = 'application-security-group' - # 'application-types' = 'application-type' - # 'applications' = 'application' - # 'artifactsources' = 'artifactsource' - # 'authorization-rules' = 'authorization-rule' - # 'authorization-servers' = 'authorization-server' - # 'automation-accounts' = 'automation-account' - # 'availability-sets' = 'availability-set' - # 'azure-firewalls' = 'azure-firewall' - # 'azure-security-center' = 'azure-security-center' - # 'backend-address-pools' = 'backend-address-pool' - # 'backends' = 'backend' - # 'backup-config' = 'backup-config' - # 'backup-long-term-retention-policies' = 'backup-long-term-retention-policy' - # 'backup-fabrics' = 'backup-fabric' - # 'backup-policies' = 'backup-policy' - # 'backup-short-term-retention-policies' = 'backup-short-term-retention-policy' - # 'backup-storage-config' = 'backup-storage-config' - # 'backup-vaults' = 'backup-vault' - # 'basic-publishing-credentials-policies' = 'basic-publishing-credentials-policy' - # 'bastion-hosts' = 'bastion-host' - # 'batch-accounts' = 'batch-account' - # 'blob-services' = 'blob-service' - # 'budgets' = 'budget' - # 'caa' = 'caa' - # 'caches' = 'cache' - # 'capacities' = 'capacity' - # 'capacity-pools' = 'capacity-pool' - # 'clusters' = 'cluster' - # 'cname' = 'cname' - # 'collections' = 'collection' - # 'components' = 'component' - # 'computes' = 'compute' - # 'config' = 'config' - # 'config--appsettings' = 'config--appsetting' - # 'config--authsettingsv2' = 'config--authsettingsv2' - # 'configuration-stores' = 'configuration-store' - # 'configurations' = 'configuration' - # 'configurations--customdnssuffix' = 'configurations--customdnssuffix' - # 'configurations--networking' = 'configurations--networking' - # 'connection-monitors' = 'connection-monitor' - # 'connections' = 'connection' - # 'connectivity-configurations' = 'connectivity-configuration' - # 'consumergroups' = 'consumergroup' - # 'container-apps' = 'container-app' - # 'container-groups' = 'container-group' - # 'containers' = 'container' - # 'costs' = 'cost' - # 'custom-domains' = 'custom-domain' - # 'data-collection-endpoints' = 'data-collection-endpoint' - # 'data-collection-rules' = 'data-collection-rule' - # 'data-exports' = 'data-export' - # 'data-sources' = 'data-source' - # 'database-accounts' = 'database-account' - # 'databases' = 'database' - # 'ddos-protection-plans' = 'ddos-protection-plan' - # 'deployment-scripts' = 'deployment-script' - # 'diagnostic-settings' = 'diagnostic-setting' - # 'dicomservices' = 'dicomservice' - # 'digital-twins-instances' = 'digital-twins-instance' - # 'disaster-recovery-configs' = 'disaster-recovery-config' - # 'disk-encryption-sets' = 'disk-encryption-set' - # 'disks' = 'disk' - # 'dns-forwarding-rulesets' = 'dns-forwarding-ruleset' - # 'dns-resolvers' = 'dns-resolver' - # 'dns-zones' = 'dns-zone' - # 'domain-services' = 'domain-service' - # 'domains' = 'domain' - # 'elastic-pools' = 'elastic-pool' - # 'encryption-protector' = 'encryption-protector' - # 'endpoints' = 'endpoint' - # 'endpoints--event-grid' = 'endpoints--event-grid' - # 'endpoints--event-hub' = 'endpoints--event-hub' - # 'endpoints--service-bus' = 'endpoints--service-bus' - # 'eventhubs' = 'eventhub' - # 'eventSubscriptions' = 'eventSubscription' - # 'express-route-circuits' = 'express-route-circuit' - # 'express-route-gateway' = 'express-route-gateway' - # 'extensions' = 'extension' - # 'factories' = 'factory' - # 'fhirdestinations' = 'fhirdestination' - # 'fhirservices' = 'fhirservice' - # 'file-services' = 'file-service' - # 'firewall-policies' = 'firewall-policy' - # 'firewall-rules' = 'firewall-rule' - # 'flexible-servers' = 'flexible-server' - # 'flow-logs' = 'flow-log' - # 'flux-configurations' = 'flux-configuration' - # 'forwarding-rules' = 'forwarding-rule' - # 'front-doors' = 'front-door' - # 'galleries' = 'gallery' - # 'graphs' = 'graph' - # 'gremlin-databases' = 'gremlin-database' - # 'groups' = 'group' - # 'health-bots' = 'health-bot' - # 'host-pools' = 'host-pool' - # 'hosting-environments' = 'hosting-environment' - # 'hub-route-tables' = 'hub-route-table' - # 'hub-virtual-network-connections' = 'hub-virtual-network-connection' - # 'hybrid-connections' = 'hybrid-connection' - # 'hybrid-connection-namespaces' = 'hybrid-connection-namespace' - # 'identity-providers' = 'identity-provider' - # 'image-templates' = 'image-template' - # 'images' = 'image' - # 'immutability-policies' = 'immutability-policy' - # 'inbound-nat-rules' = 'inbound-nat-rule' - # 'integration-runtimes' = 'integration-runtime' - # 'iotconnectors' = 'iotconnector' - # 'ip-groups' = 'ip-group' - # 'job-schedules' = 'job-schedule' - # 'key-values' = 'key-value' - # 'keys' = 'key' - # 'labs' = 'lab' - # 'linked-backends' = 'linked-backend' - # 'linked-services' = 'linked-service' - # 'linked-storage-accounts' = 'linked-storage-account' - # 'load-balancers' = 'load-balancer' - # 'local-network-gateways' = 'local-network-gateway' - # 'local-users' = 'local-user' - # 'locks' = 'lock' - # 'maintenance-configurations' = 'maintenance-configuration' - # 'managed-clusters' = 'managed-cluster' - # 'managed-environments' = 'managed-environment' - # 'managed-instances' = 'managed-instance' - # 'managed-private-endpoints' = 'managed-private-endpoint' - # 'managed-virtual-networks' = 'managed-virtual-network' - # 'management-group' = 'management-group' - # 'management-groups' = 'management-group' - # 'management-policies' = 'management-policy' - # 'metric-alerts' = 'metric-alert' - # 'migration-configurations' = 'migration-configuration' - # 'modules' = 'module' - # 'mongodb-databases' = 'mongodb-database' - # 'mx' = 'mx' - # 'named-values' = 'named-value' - # 'namespaces' = 'namespace' - # 'nat-gateways' = 'nat-gateway' - # 'nat-rules' = 'nat-rule' - # 'net-app-accounts' = 'net-app-account' - # 'network-groups' = 'network-group' - # 'network-interfaces' = 'network-interface' - # 'network-managers' = 'network-manager' - # 'network-rule-sets' = 'network-rule-set' - # 'network-security-groups' = 'network-security-group' - # 'network-watchers' = 'network-watcher' - # 'notificationchannels' = 'notificationchannel' - # 'ns' = 'ns' - # 'origins' = 'origin' - # 'policies' = 'policy' - # 'policy-assignments' = 'policy-assignment' - # 'policy-definitions' = 'policy-definition' - # 'policy-exemptions' = 'policy-exemption' - # 'policy-set-definitions' = 'policy-set-definition' - # 'policysets' = 'policyset' - # 'portalsettings' = 'portalsetting' - # 'private-dns-zone-groups' = 'private-dns-zone-group' - # 'private-dns-zones' = 'private-dns-zone' - # 'private-endpoints' = 'private-endpoint' - # 'private-link-hubs' = 'private-link-hub' - # 'private-link-scopes' = 'private-link-scope' - # 'private-link-services' = 'private-link-service' - # 'products' = 'product' - # 'profiles' = 'profile' - # 'protected-items' = 'protected-item' - # 'protection-containers' = 'protection-container' - # 'proximity-placement-groups' = 'proximity-placement-group' - # 'ptr' = 'ptr' - # 'public-ip-addresses' = 'public-ip-address' - # 'public-ip-prefixes' = 'public-ip-prefix' - # 'queue-services' = 'queue-service' - # 'queues' = 'queue' - # 'redis' = 'redis' - # 'registration-definitions' = 'registration-definition' - # 'registries' = 'registry' - # 'relays' = 'relay' - # 'remediations' = 'remediation' - # 'replication-alert-settings' = 'replication-alert-setting' - # 'replication-fabrics' = 'replication-fabric' - # 'replication-policies' = 'replication-policy' - # 'replication-protection-container-mappings' = 'replication-protection-container-mapping' - # 'replication-protection-containers' = 'replication-protection-container' - # 'replications' = 'replication' - # 'resource-group' = 'resource-group' - # 'resource-groups' = 'resource-group' - # 'role-assignments' = 'role-assignment' - # 'role-definitions' = 'role-definition' - # 'route-tables' = 'route-table' - # 'rule-collection-groups' = 'rule-collection-group' - # 'rule-collections' = 'rule-collection' - # 'rules' = 'rule' - # 'runbooks' = 'runbook' - # 'saved-searches' = 'saved-searche' - # 'scaling-plans' = 'scaling-plan' - # 'scheduled-query-rules' = 'scheduled-query-rule' - # 'schedules' = 'schedule' - # 'scope-connections' = 'scope-connection' - # 'scoped-resources' = 'scoped-resource' - # 'secrets' = 'secret' - # 'security-admin-configurations' = 'security-admin-configuration' - # 'security-alert-policies' = 'security-alert-policy' - # 'security-rules' = 'security-rule' - # 'serverfarms' = 'serverfarm' - # 'servers' = 'server' - # 'service' = 'service' - # 'service-endpoint-policies' = 'service-endpoint-policy' - # 'shares' = 'share' - # 'signal-r' = 'signal-r' - # 'sites' = 'site' - # 'slots' = 'slot' - # 'soa' = 'soa' - # 'software-update-configurations' = 'software-update-configuration' - # 'solutions' = 'solution' - # 'sql-databases' = 'sql-database' - # 'srv' = 'srv' - # 'ssh-public-keys' = 'ssh-public-key' - # 'static-members' = 'static-member' - # 'static-sites' = 'static-site' - # 'storage-accounts' = 'storage-account' - # 'storage-insight-configs' = 'storage-insight-config' - # 'subnets' = 'subnet' - # 'subscription' = 'subscription' - # 'subscriptions' = 'subscription' - # 'system-topics' = 'system-topic' - # 'table-services' = 'table-service' - # 'tables' = 'table' - # 'tags' = 'tags' - # 'topics' = 'topic' - # 'trafficmanagerprofiles' = 'trafficmanagerprofile' - # 'txt' = 'txt' - # 'user-assigned-identities' = 'user-assigned-identity' - # 'variables' = 'variable' - # 'vaults' = 'vault' - # 'virtual-hubs' = 'virtual-hub' - # 'virtual-machine-scale-sets' = 'virtual-machine-scale-set' - # 'virtual-machines' = 'virtual-machine' - # 'virtual-network-gateways' = 'virtual-network-gateway' - # 'virtual-network-links' = 'virtual-network-link' - # 'virtual-network-peerings' = 'virtual-network-peering' - # 'virtual-network-rules' = 'virtual-network-rule' - # 'virtual-networks' = 'virtual-network' - # 'virtual-wans' = 'virtual-wan' - # 'virtualnetworks' = 'virtualnetwork' - # 'volumes' = 'volume' - # 'vpn-gateways' = 'vpn-gateway' - # 'vpn-sites' = 'vpn-site' - # 'vulnerability-assessments' = 'vulnerability-assessment' - # 'wcf-relays' = 'wcf-relay' - # 'web-pub-sub' = 'web-pub-sub' - # 'webhooks' = 'webhook' - # 'webtests' = 'webtest' - # 'workflows' = 'workflow' - # 'workspaces' = 'workspace' - # } - - $jsonFile = Join-Path $PSScriptRoot '\rtMapping.jsonc' - $specialConversionHash = Get-Content -Raw $jsonFile | ConvertFrom-Json -AsHashtable + $specialConversionHash = Get-Content -Raw $ConversionFilePath | ConvertFrom-Json -AsHashtable $relevantFolderPaths = @() # Get all module folder names From d1305824976e4814842091f0ad27d8ce8ca348f7 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Sun, 13 Aug 2023 12:10:09 +0200 Subject: [PATCH 07/15] vm cross --- modules/compute/virtual-machine/main.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/compute/virtual-machine/main.bicep b/modules/compute/virtual-machine/main.bicep index 009cb6ecbd..bc4327b6af 100644 --- a/modules/compute/virtual-machine/main.bicep +++ b/modules/compute/virtual-machine/main.bicep @@ -684,7 +684,7 @@ module vm_azureDiskEncryptionExtension 'extension/main.bicep' = if (extensionAzu ] } -module vm_backup '../../recovery-services/vault/backup-fabrics/protection-container/protected-item/main.bicep' = if (!empty(backupVaultName)) { +module vm_backup '../../recovery-services/vault/backup-fabric/protection-container/protected-item/main.bicep' = if (!empty(backupVaultName)) { name: '${uniqueString(deployment().name, location)}-VM-Backup' params: { name: 'vm;iaasvmcontainerv2;${resourceGroup().name};${vm.name}' From 7f856ca1cdfafc7e93780a621196b78d35061c7f Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Sun, 13 Aug 2023 12:13:54 +0200 Subject: [PATCH 08/15] update specs aligned --- utilities/tools/helper/Get-SpecsAlignedResourceName.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/tools/helper/Get-SpecsAlignedResourceName.ps1 b/utilities/tools/helper/Get-SpecsAlignedResourceName.ps1 index 14ce9c7c7f..820a478fa6 100644 --- a/utilities/tools/helper/Get-SpecsAlignedResourceName.ps1 +++ b/utilities/tools/helper/Get-SpecsAlignedResourceName.ps1 @@ -26,7 +26,7 @@ function Get-ReducedWordString { [string] $StringToReduce ) - if ($StringToReduce -match '(.+?)(y|ii|ies|es|s)$') { + if ($StringToReduce -match '(.+?)(y|ii|e|ys|ies|es|s)$') { return $Matches[1] } From ee83b93f8691954e63d7adfbdc56a90afd3898a4 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Sun, 13 Aug 2023 12:46:43 +0200 Subject: [PATCH 09/15] tags --- .azuredevops/modulePipelines/ms.resources.tags.yml | 4 ++-- .github/workflows/ms.resources.tags.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.azuredevops/modulePipelines/ms.resources.tags.yml b/.azuredevops/modulePipelines/ms.resources.tags.yml index d38a5517f0..0df50fd906 100644 --- a/.azuredevops/modulePipelines/ms.resources.tags.yml +++ b/.azuredevops/modulePipelines/ms.resources.tags.yml @@ -29,7 +29,7 @@ trigger: include: - '/.azuredevops/modulePipelines/ms.resources.tags.yml' - '/.azuredevops/pipelineTemplates/*.yml' - - '/modules/resources/tag/*' + - '/modules/resources/tags/*' - '/utilities/pipelines/*' exclude: - '/utilities/pipelines/deploymentRemoval/*' @@ -39,7 +39,7 @@ variables: - template: '../../settings.yml' - group: 'PLATFORM_VARIABLES' - name: modulePath - value: '/modules/resources/tag' + value: '/modules/resources/tags' stages: - template: /.azuredevops/pipelineTemplates/stages.module.yml diff --git a/.github/workflows/ms.resources.tags.yml b/.github/workflows/ms.resources.tags.yml index 6723ee4ef0..1ecd040099 100644 --- a/.github/workflows/ms.resources.tags.yml +++ b/.github/workflows/ms.resources.tags.yml @@ -30,13 +30,13 @@ on: - '.github/actions/templates/**' - '.github/workflows/template.module.yml' - '.github/workflows/ms.resources.tags.yml' - - 'modules/resources/tag/**' + - 'modules/resources/tags/**' - 'utilities/pipelines/**' - '!utilities/pipelines/deploymentRemoval/**' - '!*/**/README.md' env: - modulePath: 'modules/resources/tag' + modulePath: 'modules/resources/tags' workflowPath: '.github/workflows/ms.resources.tags.yml' concurrency: From 7ac8773a4d8efce1abddf7cb905ff3e715a54eed Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Tue, 15 Aug 2023 13:50:14 +0200 Subject: [PATCH 10/15] event subscription --- .../{eventSubscription => event-subscription}/README.md | 0 .../{eventSubscription => event-subscription}/main.bicep | 0 .../{eventSubscription => event-subscription}/main.json | 0 .../{eventSubscription => event-subscription}/version.json | 0 .../topic/{eventSubscription => event-subscription}/README.md | 0 .../{eventSubscription => event-subscription}/main.bicep | 0 .../topic/{eventSubscription => event-subscription}/main.json | 0 .../{eventSubscription => event-subscription}/version.json | 0 rtMapping.jsonc | 4 ++-- 9 files changed, 2 insertions(+), 2 deletions(-) rename modules/event-grid/system-topic/{eventSubscription => event-subscription}/README.md (100%) rename modules/event-grid/system-topic/{eventSubscription => event-subscription}/main.bicep (100%) rename modules/event-grid/system-topic/{eventSubscription => event-subscription}/main.json (100%) rename modules/event-grid/system-topic/{eventSubscription => event-subscription}/version.json (100%) rename modules/event-grid/topic/{eventSubscription => event-subscription}/README.md (100%) rename modules/event-grid/topic/{eventSubscription => event-subscription}/main.bicep (100%) rename modules/event-grid/topic/{eventSubscription => event-subscription}/main.json (100%) rename modules/event-grid/topic/{eventSubscription => event-subscription}/version.json (100%) diff --git a/modules/event-grid/system-topic/eventSubscription/README.md b/modules/event-grid/system-topic/event-subscription/README.md similarity index 100% rename from modules/event-grid/system-topic/eventSubscription/README.md rename to modules/event-grid/system-topic/event-subscription/README.md diff --git a/modules/event-grid/system-topic/eventSubscription/main.bicep b/modules/event-grid/system-topic/event-subscription/main.bicep similarity index 100% rename from modules/event-grid/system-topic/eventSubscription/main.bicep rename to modules/event-grid/system-topic/event-subscription/main.bicep diff --git a/modules/event-grid/system-topic/eventSubscription/main.json b/modules/event-grid/system-topic/event-subscription/main.json similarity index 100% rename from modules/event-grid/system-topic/eventSubscription/main.json rename to modules/event-grid/system-topic/event-subscription/main.json diff --git a/modules/event-grid/system-topic/eventSubscription/version.json b/modules/event-grid/system-topic/event-subscription/version.json similarity index 100% rename from modules/event-grid/system-topic/eventSubscription/version.json rename to modules/event-grid/system-topic/event-subscription/version.json diff --git a/modules/event-grid/topic/eventSubscription/README.md b/modules/event-grid/topic/event-subscription/README.md similarity index 100% rename from modules/event-grid/topic/eventSubscription/README.md rename to modules/event-grid/topic/event-subscription/README.md diff --git a/modules/event-grid/topic/eventSubscription/main.bicep b/modules/event-grid/topic/event-subscription/main.bicep similarity index 100% rename from modules/event-grid/topic/eventSubscription/main.bicep rename to modules/event-grid/topic/event-subscription/main.bicep diff --git a/modules/event-grid/topic/eventSubscription/main.json b/modules/event-grid/topic/event-subscription/main.json similarity index 100% rename from modules/event-grid/topic/eventSubscription/main.json rename to modules/event-grid/topic/event-subscription/main.json diff --git a/modules/event-grid/topic/eventSubscription/version.json b/modules/event-grid/topic/event-subscription/version.json similarity index 100% rename from modules/event-grid/topic/eventSubscription/version.json rename to modules/event-grid/topic/event-subscription/version.json diff --git a/rtMapping.jsonc b/rtMapping.jsonc index 451a8a5b74..a1781ff325 100644 --- a/rtMapping.jsonc +++ b/rtMapping.jsonc @@ -57,8 +57,8 @@ "components": "component", "computes": "compute", "config": "config", - "config--appsettings": "config--appsetting", - "config--authsettingsv2": "config--authsettingv2", + "config--appsettings": "config--appsettings", + "config--authsettingsv2": "config--authsettingsv2", "configuration-stores": "configuration-store", "configurations": "configuration", "configurations--customdnssuffix": "configuration--customdnssuffix", From dee622eaa408c59ee8f54eee1041e5b6a2ef299c Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Tue, 15 Aug 2023 13:52:26 +0200 Subject: [PATCH 11/15] mapping --- rtMapping.jsonc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtMapping.jsonc b/rtMapping.jsonc index a1781ff325..02d74f527a 100644 --- a/rtMapping.jsonc +++ b/rtMapping.jsonc @@ -98,7 +98,7 @@ "endpoints--event-hub": "endpoint--event-hub", "endpoints--service-bus": "endpoint--service-bus", "eventhubs": "eventhub", - "eventSubscriptions": "eventSubscription", + "event-subscriptions": "event-subscription", "express-route-circuits": "express-route-circuit", "express-route-gateway": "express-route-gateway", "extensions": "extension", From 88edaa47399bf4d89292d7cb8aff40d2976a70d7 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Tue, 15 Aug 2023 13:57:11 +0200 Subject: [PATCH 12/15] ref --- modules/event-grid/system-topic/main.bicep | 2 +- modules/event-grid/topic/main.bicep | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/event-grid/system-topic/main.bicep b/modules/event-grid/system-topic/main.bicep index f2ad411a86..1b94c2cc93 100644 --- a/modules/event-grid/system-topic/main.bicep +++ b/modules/event-grid/system-topic/main.bicep @@ -139,7 +139,7 @@ resource systemTopic 'Microsoft.EventGrid/systemTopics@2021-12-01' = { } // Event subscriptions -module systemTopics_eventSubscriptions 'eventSubscription/main.bicep' = [for (eventSubscription, index) in eventSubscriptions: { +module systemTopics_eventSubscriptions 'event-subscription/main.bicep' = [for (eventSubscription, index) in eventSubscriptions: { name: '${uniqueString(deployment().name, location)}-EventGrid-SystemTopics-EventSubscriptions-${index}' params: { destination: eventSubscription.destination diff --git a/modules/event-grid/topic/main.bicep b/modules/event-grid/topic/main.bicep index a5dc2773ed..7329c82707 100644 --- a/modules/event-grid/topic/main.bicep +++ b/modules/event-grid/topic/main.bicep @@ -136,7 +136,7 @@ resource topic 'Microsoft.EventGrid/topics@2020-06-01' = { } // Event subscriptions -module topics_eventSubscriptions 'eventSubscription/main.bicep' = [for (eventSubscription, index) in eventSubscriptions: { +module topics_eventSubscriptions 'event-subscription/main.bicep' = [for (eventSubscription, index) in eventSubscriptions: { name: '${uniqueString(deployment().name, location)}-EventGrid-Topics-EventSubscriptions-${index}' params: { destination: eventSubscription.destination From 6cb98fffd69bd398fe7ff144558b8d47b0f2c9f5 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Tue, 15 Aug 2023 14:08:26 +0200 Subject: [PATCH 13/15] dig twins --- .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../{endpoints--event-hub => endpoint--event-hub}/README.md | 0 .../main.bicep | 0 .../{endpoints--event-hub => endpoint--event-hub}/main.json | 0 .../version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 modules/digital-twins/digital-twins-instance/main.bicep | 6 +++--- 13 files changed, 3 insertions(+), 3 deletions(-) rename modules/digital-twins/digital-twins-instance/{endpoints--event-grid => endpoint--event-grid}/README.md (100%) rename modules/digital-twins/digital-twins-instance/{endpoints--event-grid => endpoint--event-grid}/main.bicep (100%) rename modules/digital-twins/digital-twins-instance/{endpoints--event-grid => endpoint--event-grid}/main.json (100%) rename modules/digital-twins/digital-twins-instance/{endpoints--event-grid => endpoint--event-grid}/version.json (100%) rename modules/digital-twins/digital-twins-instance/{endpoints--event-hub => endpoint--event-hub}/README.md (100%) rename modules/digital-twins/digital-twins-instance/{endpoints--event-hub => endpoint--event-hub}/main.bicep (100%) rename modules/digital-twins/digital-twins-instance/{endpoints--event-hub => endpoint--event-hub}/main.json (100%) rename modules/digital-twins/digital-twins-instance/{endpoints--event-hub => endpoint--event-hub}/version.json (100%) rename modules/digital-twins/digital-twins-instance/{endpoints--service-bus => endpoint--service-bus}/README.md (100%) rename modules/digital-twins/digital-twins-instance/{endpoints--service-bus => endpoint--service-bus}/main.bicep (100%) rename modules/digital-twins/digital-twins-instance/{endpoints--service-bus => endpoint--service-bus}/main.json (100%) rename modules/digital-twins/digital-twins-instance/{endpoints--service-bus => endpoint--service-bus}/version.json (100%) diff --git a/modules/digital-twins/digital-twins-instance/endpoints--event-grid/README.md b/modules/digital-twins/digital-twins-instance/endpoint--event-grid/README.md similarity index 100% rename from modules/digital-twins/digital-twins-instance/endpoints--event-grid/README.md rename to modules/digital-twins/digital-twins-instance/endpoint--event-grid/README.md diff --git a/modules/digital-twins/digital-twins-instance/endpoints--event-grid/main.bicep b/modules/digital-twins/digital-twins-instance/endpoint--event-grid/main.bicep similarity index 100% rename from modules/digital-twins/digital-twins-instance/endpoints--event-grid/main.bicep rename to modules/digital-twins/digital-twins-instance/endpoint--event-grid/main.bicep diff --git a/modules/digital-twins/digital-twins-instance/endpoints--event-grid/main.json b/modules/digital-twins/digital-twins-instance/endpoint--event-grid/main.json similarity index 100% rename from modules/digital-twins/digital-twins-instance/endpoints--event-grid/main.json rename to modules/digital-twins/digital-twins-instance/endpoint--event-grid/main.json diff --git a/modules/digital-twins/digital-twins-instance/endpoints--event-grid/version.json b/modules/digital-twins/digital-twins-instance/endpoint--event-grid/version.json similarity index 100% rename from modules/digital-twins/digital-twins-instance/endpoints--event-grid/version.json rename to modules/digital-twins/digital-twins-instance/endpoint--event-grid/version.json diff --git a/modules/digital-twins/digital-twins-instance/endpoints--event-hub/README.md b/modules/digital-twins/digital-twins-instance/endpoint--event-hub/README.md similarity index 100% rename from modules/digital-twins/digital-twins-instance/endpoints--event-hub/README.md rename to modules/digital-twins/digital-twins-instance/endpoint--event-hub/README.md diff --git a/modules/digital-twins/digital-twins-instance/endpoints--event-hub/main.bicep b/modules/digital-twins/digital-twins-instance/endpoint--event-hub/main.bicep similarity index 100% rename from modules/digital-twins/digital-twins-instance/endpoints--event-hub/main.bicep rename to modules/digital-twins/digital-twins-instance/endpoint--event-hub/main.bicep diff --git a/modules/digital-twins/digital-twins-instance/endpoints--event-hub/main.json b/modules/digital-twins/digital-twins-instance/endpoint--event-hub/main.json similarity index 100% rename from modules/digital-twins/digital-twins-instance/endpoints--event-hub/main.json rename to modules/digital-twins/digital-twins-instance/endpoint--event-hub/main.json diff --git a/modules/digital-twins/digital-twins-instance/endpoints--event-hub/version.json b/modules/digital-twins/digital-twins-instance/endpoint--event-hub/version.json similarity index 100% rename from modules/digital-twins/digital-twins-instance/endpoints--event-hub/version.json rename to modules/digital-twins/digital-twins-instance/endpoint--event-hub/version.json diff --git a/modules/digital-twins/digital-twins-instance/endpoints--service-bus/README.md b/modules/digital-twins/digital-twins-instance/endpoint--service-bus/README.md similarity index 100% rename from modules/digital-twins/digital-twins-instance/endpoints--service-bus/README.md rename to modules/digital-twins/digital-twins-instance/endpoint--service-bus/README.md diff --git a/modules/digital-twins/digital-twins-instance/endpoints--service-bus/main.bicep b/modules/digital-twins/digital-twins-instance/endpoint--service-bus/main.bicep similarity index 100% rename from modules/digital-twins/digital-twins-instance/endpoints--service-bus/main.bicep rename to modules/digital-twins/digital-twins-instance/endpoint--service-bus/main.bicep diff --git a/modules/digital-twins/digital-twins-instance/endpoints--service-bus/main.json b/modules/digital-twins/digital-twins-instance/endpoint--service-bus/main.json similarity index 100% rename from modules/digital-twins/digital-twins-instance/endpoints--service-bus/main.json rename to modules/digital-twins/digital-twins-instance/endpoint--service-bus/main.json diff --git a/modules/digital-twins/digital-twins-instance/endpoints--service-bus/version.json b/modules/digital-twins/digital-twins-instance/endpoint--service-bus/version.json similarity index 100% rename from modules/digital-twins/digital-twins-instance/endpoints--service-bus/version.json rename to modules/digital-twins/digital-twins-instance/endpoint--service-bus/version.json diff --git a/modules/digital-twins/digital-twins-instance/main.bicep b/modules/digital-twins/digital-twins-instance/main.bicep index 33d4404a87..63c51286ce 100644 --- a/modules/digital-twins/digital-twins-instance/main.bicep +++ b/modules/digital-twins/digital-twins-instance/main.bicep @@ -157,7 +157,7 @@ resource digitalTwinsInstance 'Microsoft.DigitalTwins/digitalTwinsInstances@2023 } } -module digitalTwinsInstance_eventHubEndpoint 'endpoints--event-hub/main.bicep' = if (!empty(eventHubEndpoint)) { +module digitalTwinsInstance_eventHubEndpoint 'endpoint--event-hub/main.bicep' = if (!empty(eventHubEndpoint)) { name: '${uniqueString(deployment().name, location)}-DigitalTwinsInstance-Endpoints-EventHub' params: { digitalTwinInstanceName: digitalTwinsInstance.name @@ -175,7 +175,7 @@ module digitalTwinsInstance_eventHubEndpoint 'endpoints--event-hub/main.bicep' = } } -module digitalTwinsInstance_eventGridEndpoint 'endpoints--event-grid/main.bicep' = if (!empty(eventGridEndpoint)) { +module digitalTwinsInstance_eventGridEndpoint 'endpoint--event-grid/main.bicep' = if (!empty(eventGridEndpoint)) { name: '${uniqueString(deployment().name, location)}-DigitalTwinsInstance-Endpoints-EventGrid' params: { digitalTwinInstanceName: digitalTwinsInstance.name @@ -188,7 +188,7 @@ module digitalTwinsInstance_eventGridEndpoint 'endpoints--event-grid/main.bicep' } } -module digitalTwinsInstance_serviceBusEndpoint 'endpoints--service-bus/main.bicep' = if (!empty(serviceBusEndpoint)) { +module digitalTwinsInstance_serviceBusEndpoint 'endpoint--service-bus/main.bicep' = if (!empty(serviceBusEndpoint)) { name: '${uniqueString(deployment().name, location)}-DigitalTwinsInstance-Endpoints-ServiceBus' params: { digitalTwinInstanceName: digitalTwinsInstance.name From 93dd5e25ff002dedf1d5209b7e77758815bfd87e Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Tue, 15 Aug 2023 14:11:16 +0200 Subject: [PATCH 14/15] vpn --- modules/network/vpn-gateway/main.bicep | 2 +- .../vpn-gateway/{vpn-connections => vpn-connection}/README.md | 0 .../vpn-gateway/{vpn-connections => vpn-connection}/main.bicep | 0 .../vpn-gateway/{vpn-connections => vpn-connection}/main.json | 0 .../{vpn-connections => vpn-connection}/version.json | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename modules/network/vpn-gateway/{vpn-connections => vpn-connection}/README.md (100%) rename modules/network/vpn-gateway/{vpn-connections => vpn-connection}/main.bicep (100%) rename modules/network/vpn-gateway/{vpn-connections => vpn-connection}/main.json (100%) rename modules/network/vpn-gateway/{vpn-connections => vpn-connection}/version.json (100%) diff --git a/modules/network/vpn-gateway/main.bicep b/modules/network/vpn-gateway/main.bicep index 8872675c18..54288b6e18 100644 --- a/modules/network/vpn-gateway/main.bicep +++ b/modules/network/vpn-gateway/main.bicep @@ -95,7 +95,7 @@ module vpnGateway_natRules 'nat-rule/main.bicep' = [for (natRule, index) in natR } }] -module vpnGateway_vpnConnections 'vpn-connections/main.bicep' = [for (connection, index) in vpnConnections: { +module vpnGateway_vpnConnections 'vpn-connection/main.bicep' = [for (connection, index) in vpnConnections: { name: '${deployment().name}-Connection-${index}' params: { name: connection.name diff --git a/modules/network/vpn-gateway/vpn-connections/README.md b/modules/network/vpn-gateway/vpn-connection/README.md similarity index 100% rename from modules/network/vpn-gateway/vpn-connections/README.md rename to modules/network/vpn-gateway/vpn-connection/README.md diff --git a/modules/network/vpn-gateway/vpn-connections/main.bicep b/modules/network/vpn-gateway/vpn-connection/main.bicep similarity index 100% rename from modules/network/vpn-gateway/vpn-connections/main.bicep rename to modules/network/vpn-gateway/vpn-connection/main.bicep diff --git a/modules/network/vpn-gateway/vpn-connections/main.json b/modules/network/vpn-gateway/vpn-connection/main.json similarity index 100% rename from modules/network/vpn-gateway/vpn-connections/main.json rename to modules/network/vpn-gateway/vpn-connection/main.json diff --git a/modules/network/vpn-gateway/vpn-connections/version.json b/modules/network/vpn-gateway/vpn-connection/version.json similarity index 100% rename from modules/network/vpn-gateway/vpn-connections/version.json rename to modules/network/vpn-gateway/vpn-connection/version.json From 0b9be5fe538e46c6b9f993f62e7888db23035f04 Mon Sep 17 00:00:00 2001 From: Erika Gressi Date: Tue, 15 Aug 2023 14:14:05 +0200 Subject: [PATCH 15/15] web --- .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 .../README.md | 0 .../main.bicep | 0 .../main.json | 0 .../version.json | 0 modules/web/hosting-environment/main.bicep | 4 ++-- .../{config--appsetting => config--appsettings}/README.md | 0 .../{config--appsetting => config--appsettings}/main.bicep | 0 .../{config--appsetting => config--appsettings}/main.json | 0 .../{config--appsetting => config--appsettings}/version.json | 0 modules/web/site/main.bicep | 2 +- .../{config--appsetting => config--appsettings}/README.md | 0 .../{config--appsetting => config--appsettings}/main.bicep | 0 .../{config--appsetting => config--appsettings}/main.json | 0 .../{config--appsetting => config--appsettings}/version.json | 0 modules/web/site/slot/main.bicep | 2 +- rtMapping.jsonc | 4 ++-- 20 files changed, 6 insertions(+), 6 deletions(-) rename modules/web/hosting-environment/{configurations--customdnssuffix => configuration--customdnssuffix}/README.md (100%) rename modules/web/hosting-environment/{configurations--customdnssuffix => configuration--customdnssuffix}/main.bicep (100%) rename modules/web/hosting-environment/{configurations--customdnssuffix => configuration--customdnssuffix}/main.json (100%) rename modules/web/hosting-environment/{configurations--customdnssuffix => configuration--customdnssuffix}/version.json (100%) rename modules/web/hosting-environment/{configurations--networking => configuration--networking}/README.md (100%) rename modules/web/hosting-environment/{configurations--networking => configuration--networking}/main.bicep (100%) rename modules/web/hosting-environment/{configurations--networking => configuration--networking}/main.json (100%) rename modules/web/hosting-environment/{configurations--networking => configuration--networking}/version.json (100%) rename modules/web/site/{config--appsetting => config--appsettings}/README.md (100%) rename modules/web/site/{config--appsetting => config--appsettings}/main.bicep (100%) rename modules/web/site/{config--appsetting => config--appsettings}/main.json (100%) rename modules/web/site/{config--appsetting => config--appsettings}/version.json (100%) rename modules/web/site/slot/{config--appsetting => config--appsettings}/README.md (100%) rename modules/web/site/slot/{config--appsetting => config--appsettings}/main.bicep (100%) rename modules/web/site/slot/{config--appsetting => config--appsettings}/main.json (100%) rename modules/web/site/slot/{config--appsetting => config--appsettings}/version.json (100%) diff --git a/modules/web/hosting-environment/configurations--customdnssuffix/README.md b/modules/web/hosting-environment/configuration--customdnssuffix/README.md similarity index 100% rename from modules/web/hosting-environment/configurations--customdnssuffix/README.md rename to modules/web/hosting-environment/configuration--customdnssuffix/README.md diff --git a/modules/web/hosting-environment/configurations--customdnssuffix/main.bicep b/modules/web/hosting-environment/configuration--customdnssuffix/main.bicep similarity index 100% rename from modules/web/hosting-environment/configurations--customdnssuffix/main.bicep rename to modules/web/hosting-environment/configuration--customdnssuffix/main.bicep diff --git a/modules/web/hosting-environment/configurations--customdnssuffix/main.json b/modules/web/hosting-environment/configuration--customdnssuffix/main.json similarity index 100% rename from modules/web/hosting-environment/configurations--customdnssuffix/main.json rename to modules/web/hosting-environment/configuration--customdnssuffix/main.json diff --git a/modules/web/hosting-environment/configurations--customdnssuffix/version.json b/modules/web/hosting-environment/configuration--customdnssuffix/version.json similarity index 100% rename from modules/web/hosting-environment/configurations--customdnssuffix/version.json rename to modules/web/hosting-environment/configuration--customdnssuffix/version.json diff --git a/modules/web/hosting-environment/configurations--networking/README.md b/modules/web/hosting-environment/configuration--networking/README.md similarity index 100% rename from modules/web/hosting-environment/configurations--networking/README.md rename to modules/web/hosting-environment/configuration--networking/README.md diff --git a/modules/web/hosting-environment/configurations--networking/main.bicep b/modules/web/hosting-environment/configuration--networking/main.bicep similarity index 100% rename from modules/web/hosting-environment/configurations--networking/main.bicep rename to modules/web/hosting-environment/configuration--networking/main.bicep diff --git a/modules/web/hosting-environment/configurations--networking/main.json b/modules/web/hosting-environment/configuration--networking/main.json similarity index 100% rename from modules/web/hosting-environment/configurations--networking/main.json rename to modules/web/hosting-environment/configuration--networking/main.json diff --git a/modules/web/hosting-environment/configurations--networking/version.json b/modules/web/hosting-environment/configuration--networking/version.json similarity index 100% rename from modules/web/hosting-environment/configurations--networking/version.json rename to modules/web/hosting-environment/configuration--networking/version.json diff --git a/modules/web/hosting-environment/main.bicep b/modules/web/hosting-environment/main.bicep index 30aeeeac72..40ec20ece0 100644 --- a/modules/web/hosting-environment/main.bicep +++ b/modules/web/hosting-environment/main.bicep @@ -217,7 +217,7 @@ resource appServiceEnvironment 'Microsoft.Web/hostingEnvironments@2022-03-01' = } } -module appServiceEnvironment_configurations_networking 'configurations--networking/main.bicep' = if (kind == 'ASEv3') { +module appServiceEnvironment_configurations_networking 'configuration--networking/main.bicep' = if (kind == 'ASEv3') { name: '${uniqueString(deployment().name, location)}-AppServiceEnv-Configurations-Networking' params: { hostingEnvironmentName: appServiceEnvironment.name @@ -229,7 +229,7 @@ module appServiceEnvironment_configurations_networking 'configurations--networki } } -module appServiceEnvironment_configurations_customDnsSuffix 'configurations--customdnssuffix/main.bicep' = if (kind == 'ASEv3' && !empty(customDnsSuffix)) { +module appServiceEnvironment_configurations_customDnsSuffix 'configuration--customdnssuffix/main.bicep' = if (kind == 'ASEv3' && !empty(customDnsSuffix)) { name: '${uniqueString(deployment().name, location)}-AppServiceEnv-Configurations-CustomDnsSuffix' params: { hostingEnvironmentName: appServiceEnvironment.name diff --git a/modules/web/site/config--appsetting/README.md b/modules/web/site/config--appsettings/README.md similarity index 100% rename from modules/web/site/config--appsetting/README.md rename to modules/web/site/config--appsettings/README.md diff --git a/modules/web/site/config--appsetting/main.bicep b/modules/web/site/config--appsettings/main.bicep similarity index 100% rename from modules/web/site/config--appsetting/main.bicep rename to modules/web/site/config--appsettings/main.bicep diff --git a/modules/web/site/config--appsetting/main.json b/modules/web/site/config--appsettings/main.json similarity index 100% rename from modules/web/site/config--appsetting/main.json rename to modules/web/site/config--appsettings/main.json diff --git a/modules/web/site/config--appsetting/version.json b/modules/web/site/config--appsettings/version.json similarity index 100% rename from modules/web/site/config--appsetting/version.json rename to modules/web/site/config--appsettings/version.json diff --git a/modules/web/site/main.bicep b/modules/web/site/main.bicep index 36cf695b68..f28d9d8599 100644 --- a/modules/web/site/main.bicep +++ b/modules/web/site/main.bicep @@ -288,7 +288,7 @@ resource app 'Microsoft.Web/sites@2021-03-01' = { } } -module app_appsettings 'config--appsetting/main.bicep' = if (!empty(appSettingsKeyValuePairs)) { +module app_appsettings 'config--appsettings/main.bicep' = if (!empty(appSettingsKeyValuePairs)) { name: '${uniqueString(deployment().name, location)}-Site-Config-AppSettings' params: { appName: app.name diff --git a/modules/web/site/slot/config--appsetting/README.md b/modules/web/site/slot/config--appsettings/README.md similarity index 100% rename from modules/web/site/slot/config--appsetting/README.md rename to modules/web/site/slot/config--appsettings/README.md diff --git a/modules/web/site/slot/config--appsetting/main.bicep b/modules/web/site/slot/config--appsettings/main.bicep similarity index 100% rename from modules/web/site/slot/config--appsetting/main.bicep rename to modules/web/site/slot/config--appsettings/main.bicep diff --git a/modules/web/site/slot/config--appsetting/main.json b/modules/web/site/slot/config--appsettings/main.json similarity index 100% rename from modules/web/site/slot/config--appsetting/main.json rename to modules/web/site/slot/config--appsettings/main.json diff --git a/modules/web/site/slot/config--appsetting/version.json b/modules/web/site/slot/config--appsettings/version.json similarity index 100% rename from modules/web/site/slot/config--appsetting/version.json rename to modules/web/site/slot/config--appsettings/version.json diff --git a/modules/web/site/slot/main.bicep b/modules/web/site/slot/main.bicep index 93e6228dd3..75871fe8dd 100644 --- a/modules/web/site/slot/main.bicep +++ b/modules/web/site/slot/main.bicep @@ -300,7 +300,7 @@ resource slot 'Microsoft.Web/sites/slots@2022-03-01' = { } } -module slot_appsettings 'config--appsetting/main.bicep' = if (!empty(appSettingsKeyValuePairs)) { +module slot_appsettings 'config--appsettings/main.bicep' = if (!empty(appSettingsKeyValuePairs)) { name: '${uniqueString(deployment().name, location)}-Slot-${name}-Config-AppSettings' params: { slotName: slot.name diff --git a/rtMapping.jsonc b/rtMapping.jsonc index 02d74f527a..7faeda57e3 100644 --- a/rtMapping.jsonc +++ b/rtMapping.jsonc @@ -57,8 +57,8 @@ "components": "component", "computes": "compute", "config": "config", - "config--appsettings": "config--appsettings", - "config--authsettingsv2": "config--authsettingsv2", + "config--appsetting": "config--appsettings", + "config--authsettingv2": "config--authsettingsv2", "configuration-stores": "configuration-store", "configurations": "configuration", "configurations--customdnssuffix": "configuration--customdnssuffix",