From 8d4ff53e63ba27be86053d9f02b44fce0c746532 Mon Sep 17 00:00:00 2001 From: Breanna-Stryker <74314422+Breanna-Stryker@users.noreply.github.com> Date: Mon, 4 Apr 2022 14:39:43 -0400 Subject: [PATCH] Breestryker/restructure code (#699) * So many renames. * Fix mlz.bicep. * Add brief readmes to core and module. * GitHub Action: Build Bicep to JSON Co-authored-by: Bree Stryker Co-authored-by: github-actions --- .../nightlybuild/templates/az-deployment.yml | 2 +- .gitignore | 2 +- docs/deployment-guide-bicep.md | 4 +-- docs/deployment-guide-terraform.md | 2 +- docs/policies.md | 2 +- .../remote-access}/README.md | 2 +- .../remote-access}/main.bicep | 2 +- .../remote-access}/main.json | 0 .../newWorkload => add-ons/tier3}/README.md | 18 ++++++------- .../tier3/modules/hub-network-peering.bicep} | 2 +- .../tier3/tier3.bicep} | 8 +++--- src/bicep/core/README.md | 5 ++++ .../hub-network-peerings.bicep} | 2 +- .../hub-network.bicep} | 16 ++++++------ .../remote-access.bicep} | 10 +++---- .../spoke-network-peering.bicep} | 2 +- .../spoke-network.bicep} | 8 +++--- src/bicep/examples/README.md | 14 +++++----- .../README.md | 0 .../app-service.bicep} | 9 ++++--- .../modules/app-service-plan.bicep} | 0 .../modules/app-service-settings.bicep} | 0 .../README.md | 4 +-- .../automation-account.bicep} | 2 +- .../modules/automation-account.bicep} | 0 .../README.md | 4 +-- .../container-registry.bicep} | 2 +- .../modules/container-registry.bicep} | 0 .../{inheritTags => inherit-tags}/README.md | 2 +- .../inherit-tags.bicep} | 0 .../{keyVault => key-vault}/README.md | 2 +- .../key-vault.bicep} | 2 +- .../modules/key-vault.bicep} | 0 .../README.md | 0 src/bicep/mlz.bicep | 26 +++++++++---------- src/bicep/modules/README.md | 5 ++++ .../{bastionHost.bicep => bastion-host.bicep} | 0 ...ralLogging.bicep => central-logging.bicep} | 0 ...hine.bicep => linux-virtual-machine.bicep} | 0 ...=> log-analytics-diagnostic-logging.bicep} | 0 ...ce.bicep => log-analytics-workspace.bicep} | 0 ...nterface.bicep => network-interface.bicep} | 0 ...oup.bicep => network-security-group.bicep} | 0 ...signment.bicep => policy-assignment.bicep} | 2 +- .../{privateLink.bicep => private-link.bicep} | 0 ...PAddress.bicep => public-ip-address.bicep} | 0 ...sourceGroup.bicep => resource-group.bicep} | 0 ...Assignment.bicep => role-assignment.bicep} | 0 .../{routeTable.bicep => route-table.bicep} | 0 ...ageAccount.bicep => storage-account.bicep} | 0 ...ng.bicep => virtual-network-peering.bicep} | 0 ...ualNetwork.bicep => virtual-network.bicep} | 0 ...ne.bicep => windows-virtual-machine.bicep} | 0 53 files changed, 86 insertions(+), 75 deletions(-) rename src/bicep/{examples/remoteAccess => add-ons/remote-access}/README.md (99%) rename src/bicep/{examples/remoteAccess => add-ons/remote-access}/main.bicep (98%) rename src/bicep/{examples/remoteAccess => add-ons/remote-access}/main.json (100%) rename src/bicep/{examples/newWorkload => add-ons/tier3}/README.md (83%) rename src/bicep/{examples/newWorkload/modules/hubNetworkPeering.bicep => add-ons/tier3/modules/hub-network-peering.bicep} (95%) rename src/bicep/{examples/newWorkload/newWorkload.bicep => add-ons/tier3/tier3.bicep} (96%) create mode 100644 src/bicep/core/README.md rename src/bicep/{modules/hubNetworkPeerings.bicep => core/hub-network-peerings.bicep} (77%) rename src/bicep/{modules/hubNetwork.bicep => core/hub-network.bicep} (92%) rename src/bicep/{modules/remoteAccess.bicep => core/remote-access.bicep} (92%) rename src/bicep/{modules/spokeNetworkPeering.bicep => core/spoke-network-peering.bicep} (87%) rename src/bicep/{modules/spokeNetwork.bicep => core/spoke-network.bicep} (92%) rename src/bicep/examples/{appServicePlan => app-service-plan}/README.md (100%) rename src/bicep/examples/{appServicePlan/appService.bicep => app-service-plan/app-service.bicep} (91%) rename src/bicep/examples/{appServicePlan/modules/appServicePlan.bicep => app-service-plan/modules/app-service-plan.bicep} (100%) rename src/bicep/examples/{appServicePlan/modules/appServiceSettings.bicep => app-service-plan/modules/app-service-settings.bicep} (100%) rename src/bicep/examples/{automationAccount => automation-account}/README.md (92%) rename src/bicep/examples/{automationAccount/automationAccount.bicep => automation-account/automation-account.bicep} (97%) rename src/bicep/examples/{automationAccount/modules/automationAccount.bicep => automation-account/modules/automation-account.bicep} (100%) rename src/bicep/examples/{containerRegistry => container-registry}/README.md (95%) rename src/bicep/examples/{containerRegistry/contRegistry.bicep => container-registry/container-registry.bicep} (96%) rename src/bicep/examples/{containerRegistry/modules/containerRegistry.bicep => container-registry/modules/container-registry.bicep} (100%) rename src/bicep/examples/{inheritTags => inherit-tags}/README.md (98%) rename src/bicep/examples/{inheritTags/inherit.bicep => inherit-tags/inherit-tags.bicep} (100%) rename src/bicep/examples/{keyVault => key-vault}/README.md (97%) rename src/bicep/examples/{keyVault/azureKeyVault.bicep => key-vault/key-vault.bicep} (97%) rename src/bicep/examples/{keyVault/modules/keyVault.bicep => key-vault/modules/key-vault.bicep} (100%) rename src/bicep/examples/{zeroTrustWorkbook => zero-trust-workbook}/README.md (100%) create mode 100644 src/bicep/modules/README.md rename src/bicep/modules/{bastionHost.bicep => bastion-host.bicep} (100%) rename src/bicep/modules/{centralLogging.bicep => central-logging.bicep} (100%) rename src/bicep/modules/{linuxVirtualMachine.bicep => linux-virtual-machine.bicep} (100%) rename src/bicep/modules/{logAnalyticsDiagnosticLogging.bicep => log-analytics-diagnostic-logging.bicep} (100%) rename src/bicep/modules/{logAnalyticsWorkspace.bicep => log-analytics-workspace.bicep} (100%) rename src/bicep/modules/{networkInterface.bicep => network-interface.bicep} (100%) rename src/bicep/modules/{networkSecurityGroup.bicep => network-security-group.bicep} (100%) rename src/bicep/modules/{policyAssignment.bicep => policy-assignment.bicep} (98%) rename src/bicep/modules/{privateLink.bicep => private-link.bicep} (100%) rename src/bicep/modules/{publicIPAddress.bicep => public-ip-address.bicep} (100%) rename src/bicep/modules/{resourceGroup.bicep => resource-group.bicep} (100%) rename src/bicep/modules/{roleAssignment.bicep => role-assignment.bicep} (100%) rename src/bicep/modules/{routeTable.bicep => route-table.bicep} (100%) rename src/bicep/modules/{storageAccount.bicep => storage-account.bicep} (100%) rename src/bicep/modules/{virtualNetworkPeering.bicep => virtual-network-peering.bicep} (100%) rename src/bicep/modules/{virtualNetwork.bicep => virtual-network.bicep} (100%) rename src/bicep/modules/{windowsVirtualMachine.bicep => windows-virtual-machine.bicep} (100%) diff --git a/.azure-devops/nightlybuild/templates/az-deployment.yml b/.azure-devops/nightlybuild/templates/az-deployment.yml index 302efbd31..5b238aa9a 100644 --- a/.azure-devops/nightlybuild/templates/az-deployment.yml +++ b/.azure-devops/nightlybuild/templates/az-deployment.yml @@ -54,5 +54,5 @@ steps: --subscription ${{ parameters.WorkloadSubId }} \ --location ${{ parameters.Location }} \ --name ${{ parameters.WorkloadName }} \ - --template-file $(Build.SourcesDirectory)/src/bicep/examples/newWorkload/newWorkload.bicep \ + --template-file $(Build.SourcesDirectory)/src/bicep/examples/tier3/tier3.bicep \ --parameters resourcePrefix=$datetime diff --git a/.gitignore b/.gitignore index 7606db2ba..2cd8dcb92 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,4 @@ deploymentVariables.json src/bicep/examples/appServicePlan/appService.json src/bicep/examples/containerRegistry/contRegistry.json src/bicep/examples/keyVault/azureKeyVault.json -src/bicep/examples/newWorkload/newWorkload.json +src/bicep/examples/tier3/tier3.json diff --git a/docs/deployment-guide-bicep.md b/docs/deployment-guide-bicep.md index f21987337..6ed23569e 100644 --- a/docs/deployment-guide-bicep.md +++ b/docs/deployment-guide-bicep.md @@ -221,9 +221,9 @@ params: { MLZ allows for deploying one or many workloads that are peered to the hub network. Each workload can be in its own subscription or multiple workloads may be combined into a single subscription. -A separate Bicep template is provided for deploying an empty workload. It deploys a virtual network, a route table, a network security group, a storage account (for logs), and a network peering to the hub network. The template is at [src/bicep/examples/newWorkload](../src/bicep/examples/newWorkload). You can use this template as a starting point to create and customize specific workload deployments. +A separate Bicep template is provided for deploying an empty workload. It deploys a virtual network, a route table, a network security group, a storage account (for logs), and a network peering to the hub network. The template is at [src/bicep/add-ons/tier3](../src/bicep/add-ons/tier3). You can use this template as a starting point to create and customize specific workload deployments. -The `newWorkload` template contains defaults for IP address ranges, but additional workloads will require planning for additional ranges. The following parameters affect `newWorkload` networking: +The `tier3` template contains defaults for IP address ranges, but additional workloads will require planning for additional ranges. The following parameters affect `tier3` networking: Parameter name | Default Value | Description -------------- | ------------- | ----------- diff --git a/docs/deployment-guide-terraform.md b/docs/deployment-guide-terraform.md index f863c91c0..68e0d3ce2 100644 --- a/docs/deployment-guide-terraform.md +++ b/docs/deployment-guide-terraform.md @@ -99,7 +99,7 @@ MLZ allows for deploying one or many workloads that are peered to the hub networ A separate Terraform template is provided for deploying an empty workload `src/terraform/tier3`. You can use this template as a starting point to create and customize specific workload deployments. -The following parameters affect newWorkload networking. To override the defaults edit the variables file at [`src/terraform/tier3/variables.tf`](../src/terraform/tier3/variables.tf). +The following parameters affect tier3 networking. To override the defaults edit the variables file at [`src/terraform/tier3/variables.tf`](../src/terraform/tier3/variables.tf). Parameter name | Default Value | Description -------------- | ------------- | ----------- diff --git a/docs/policies.md b/docs/policies.md index 8599ad427..761b54a1f 100644 --- a/docs/policies.md +++ b/docs/policies.md @@ -56,7 +56,7 @@ Or, you can apply policy after deploying MLZ: az deployment group create \ --resource-group \ --name \ - --template-file ./src/bicep/modules/policyAssignment.bicep \ + --template-file ./src/bicep/modules/policy-assignment.bicep \ --parameters builtInAssignment= logAnalyticsWorkspaceName= \ --parameters logAnalyticsWorkspaceName= \ --parameters logAnalyticsWorkspaceResourceGroupName= diff --git a/src/bicep/examples/remoteAccess/README.md b/src/bicep/add-ons/remote-access/README.md similarity index 99% rename from src/bicep/examples/remoteAccess/README.md rename to src/bicep/add-ons/remote-access/README.md index 18bec5f99..889327f26 100644 --- a/src/bicep/examples/remoteAccess/README.md +++ b/src/bicep/add-ons/remote-access/README.md @@ -83,7 +83,7 @@ Once you have the Mission LZ output values, you can pass those in as parameters For example, deploying using the `az deployment group create` command in the Azure CLI: ```bash -cd examples/remoteAccess +cd add-ons/remote-access hubResourceGroupName="mlz-dev-hub" hubVirtualNetworkName="hub-vnet" diff --git a/src/bicep/examples/remoteAccess/main.bicep b/src/bicep/add-ons/remote-access/main.bicep similarity index 98% rename from src/bicep/examples/remoteAccess/main.bicep rename to src/bicep/add-ons/remote-access/main.bicep index 1a701b5f8..7e6b7309d 100644 --- a/src/bicep/examples/remoteAccess/main.bicep +++ b/src/bicep/add-ons/remote-access/main.bicep @@ -65,7 +65,7 @@ var defaultTags = { } var calculatedTags = union(tags, defaultTags) -module remoteAccess '../../modules/remoteAccess.bicep' = { +module remoteAccess '../../core/remote-access.bicep' = { name: 'deploy-remoteAccess-Example-${nowUtc}' params: { location: location diff --git a/src/bicep/examples/remoteAccess/main.json b/src/bicep/add-ons/remote-access/main.json similarity index 100% rename from src/bicep/examples/remoteAccess/main.json rename to src/bicep/add-ons/remote-access/main.json diff --git a/src/bicep/examples/newWorkload/README.md b/src/bicep/add-ons/tier3/README.md similarity index 83% rename from src/bicep/examples/newWorkload/README.md rename to src/bicep/add-ons/tier3/README.md index 15ac4a050..30ab414fe 100644 --- a/src/bicep/examples/newWorkload/README.md +++ b/src/bicep/add-ons/tier3/README.md @@ -30,9 +30,9 @@ virtualNetworkAddressPrefix | 10.0.125.0/26 | The address prefix for the network ### Generate MLZ Variable File -For instructions on generating 'deploymentVariables.json' using both Azure PowerShell and Azure CLI, please see the [README at the root of the examples folder](..\README.md). +For instructions on generating 'deploymentVariables.json' using both Azure PowerShell and Azure CLI, please see the [README at the root of the examples folder](..\examples\README.md). -Place the resulting 'deploymentVariables.json' file within the ./src/bicep/examples folder. +Place the resulting 'deploymentVariables.json' file within the ./src/bicep/add-ons folder. ## Deploy the example @@ -42,24 +42,24 @@ And deploy with `az deployment sub create` from the Azure CLI or `New-AzSubscrip ### Deploying the new workload -Connect to the appropriate Azure Environment and set appropriate context, see [getting started with Azure PowerShell or Azure CLI](..\README.md) for help if needed. The commands below assume you are deploying in Azure Commercial and show the entire process from deploying MLZ and then adding an Azure App Service Plan post-deployment. +Connect to the appropriate Azure Environment and set appropriate context, see [getting started with Azure PowerShell or Azure CLI](..\examples\README.md) for help if needed. The commands below assume you are deploying in Azure Commercial and show the entire process from deploying MLZ and then adding an Azure App Service Plan post-deployment. ```PowerShell cd .\src\bicep Connect-AzAccount New-AzSubscriptionDeployment -Name contoso -TemplateFile .\mlz.bicep -resourcePrefix 'contoso' -Location 'eastus' -cd .\examples +cd .\add-ons (Get-AzSubscriptionDeployment -Name contoso).outputs | ConvertTo-Json | Out-File -FilePath .\deploymentVariables.json -cd .\newWorkload -New-AzSubscriptionDeployment -DeploymentName deployNewWorkload -TemplateFile .\newWorkload.bicep -resourcePrefix myWorkload -Location 'eastus' +cd .\tier3 +New-AzSubscriptionDeployment -DeploymentName deployTier3 -TemplateFile .\tier3.bicep -resourcePrefix myTier3 -Location 'eastus' ``` ```Azure CLI az login cd src/bicep az deployment sub create -n contoso -f mlz.bicep -l eastus --parameters resourcePrefix=contoso -cd examples +cd add-ons az deployment sub show -n contoso --query properties.outputs > ./deploymentVariables.json -cd newWorkload -az deployment sub create -n deployNewWorkload -f newWorkload.bicep -l eastus --parameters resourcePrefix='myWorkload' +cd tier3 +az deployment sub create -n deployTier3 -f tier3.bicep -l eastus --parameters resourcePrefix='myTier3' ``` diff --git a/src/bicep/examples/newWorkload/modules/hubNetworkPeering.bicep b/src/bicep/add-ons/tier3/modules/hub-network-peering.bicep similarity index 95% rename from src/bicep/examples/newWorkload/modules/hubNetworkPeering.bicep rename to src/bicep/add-ons/tier3/modules/hub-network-peering.bicep index fdc02b14d..3262fe5a7 100644 --- a/src/bicep/examples/newWorkload/modules/hubNetworkPeering.bicep +++ b/src/bicep/add-ons/tier3/modules/hub-network-peering.bicep @@ -10,7 +10,7 @@ param hubVirtualNetworkName string param spokeVirtualNetworkName string param spokeVirtualNetworkResourceId string -module hubToSpokeVirtualNetworkPeering '../../../modules/virtualNetworkPeering.bicep' = { +module hubToSpokeVirtualNetworkPeering '../../../modules/virtual-network-peering.bicep' = { scope: resourceGroup(hubResourceGroupName) name: 'hubToSpokeVirtualNetworkPeering' params: { diff --git a/src/bicep/examples/newWorkload/newWorkload.bicep b/src/bicep/add-ons/tier3/tier3.bicep similarity index 96% rename from src/bicep/examples/newWorkload/newWorkload.bicep rename to src/bicep/add-ons/tier3/tier3.bicep index 98f8b3978..7611b38b8 100644 --- a/src/bicep/examples/newWorkload/newWorkload.bicep +++ b/src/bicep/add-ons/tier3/tier3.bicep @@ -116,7 +116,7 @@ var defaultTags = { } var calculatedTags = union(tags, defaultTags) -module resourceGroup '../../modules/resourceGroup.bicep' = { +module resourceGroup '../../modules/resource-group.bicep' = { name: workloadResourceGroupName params: { name: workloadResourceGroupName @@ -125,7 +125,7 @@ module resourceGroup '../../modules/resourceGroup.bicep' = { } } -module spokeNetwork '../../modules/spokeNetwork.bicep' = { +module spokeNetwork '../../core/spoke-network.bicep' = { name: 'spokeNetwork' scope: az.resourceGroup(resourceGroup.name) params: { @@ -154,7 +154,7 @@ module spokeNetwork '../../modules/spokeNetwork.bicep' = { } } -module workloadVirtualNetworkPeerings '../../modules/spokeNetworkPeering.bicep' = { +module workloadVirtualNetworkPeerings '../../core/spoke-network-peering.bicep' = { name: take('${workloadName}-to-hub-vnet-peering', 64) params: { spokeName: workloadName @@ -166,7 +166,7 @@ module workloadVirtualNetworkPeerings '../../modules/spokeNetworkPeering.bicep' } } -module hubToWorkloadVirtualNetworkPeering './modules/hubNetworkPeering.bicep' = { +module hubToWorkloadVirtualNetworkPeering './modules/hub-network-peering.bicep' = { scope: subscription(hubSubscriptionId) name: take('hub-to-${workloadName}-vnet-peering', 64) params: { diff --git a/src/bicep/core/README.md b/src/bicep/core/README.md new file mode 100644 index 000000000..98b980ff4 --- /dev/null +++ b/src/bicep/core/README.md @@ -0,0 +1,5 @@ +# Mission Landing Zone Core Bicep Templates + +This folder contains the core bicep templates deploying Mission Landing Zone. These templates provide the core networking and functionality for the landing zone. These components make use of the modules in the [Modules](../modules/) folder. + +See the [Deployment Guide for Bicep](../../docs/deployment-guide-bicep.md) for detailed instructions on how to use these templates. diff --git a/src/bicep/modules/hubNetworkPeerings.bicep b/src/bicep/core/hub-network-peerings.bicep similarity index 77% rename from src/bicep/modules/hubNetworkPeerings.bicep rename to src/bicep/core/hub-network-peerings.bicep index fc0edbd6d..4dcf6d6bc 100644 --- a/src/bicep/modules/hubNetworkPeerings.bicep +++ b/src/bicep/core/hub-network-peerings.bicep @@ -6,7 +6,7 @@ Licensed under the MIT License. param hubVirtualNetworkName string param spokes array -module hubToSpokePeering './virtualNetworkPeering.bicep' = [ for spoke in spokes: { +module hubToSpokePeering '../modules/virtual-network-peering.bicep' = [ for spoke in spokes: { name: 'hub-to-${spoke.type}-vnet-peering' params: { name: '${hubVirtualNetworkName}/to-${spoke.virtualNetworkName}' diff --git a/src/bicep/modules/hubNetwork.bicep b/src/bicep/core/hub-network.bicep similarity index 92% rename from src/bicep/modules/hubNetwork.bicep rename to src/bicep/core/hub-network.bicep index 0f5e001e9..71fa81a12 100644 --- a/src/bicep/modules/hubNetwork.bicep +++ b/src/bicep/core/hub-network.bicep @@ -76,7 +76,7 @@ param supportedClouds array = [ 'AzureUSGovernment' ] -module logStorage './storageAccount.bicep' = { +module logStorage '../modules/storage-account.bicep' = { name: 'logStorage' params: { storageAccountName: logStorageAccountName @@ -86,7 +86,7 @@ module logStorage './storageAccount.bicep' = { } } -module networkSecurityGroup './networkSecurityGroup.bicep' = { +module networkSecurityGroup '../modules/network-security-group.bicep' = { name: 'networkSecurityGroup' params: { name: networkSecurityGroupName @@ -103,7 +103,7 @@ module networkSecurityGroup './networkSecurityGroup.bicep' = { } } -module virtualNetwork './virtualNetwork.bicep' = { +module virtualNetwork '../modules/virtual-network.bicep' = { name: 'virtualNetwork' params: { name: virtualNetworkName @@ -137,7 +137,7 @@ module virtualNetwork './virtualNetwork.bicep' = { } } -module routeTable './routeTable.bicep' = { +module routeTable '../modules/route-table.bicep' = { name: 'routeTable' params: { name: routeTableName @@ -171,7 +171,7 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2021-02-01' = { ] } -module firewallClientPublicIPAddress './publicIPAddress.bicep' = { +module firewallClientPublicIPAddress '../modules/public-ip-address.bicep' = { name: 'firewallClientPublicIPAddress' params: { name: firewallClientPublicIPAddressName @@ -190,7 +190,7 @@ module firewallClientPublicIPAddress './publicIPAddress.bicep' = { } } -module firewallManagementPublicIPAddress './publicIPAddress.bicep' = { +module firewallManagementPublicIPAddress '../modules/public-ip-address.bicep' = { name: 'firewallManagementPublicIPAddress' params: { name: firewallManagementPublicIPAddressName @@ -209,7 +209,7 @@ module firewallManagementPublicIPAddress './publicIPAddress.bicep' = { } } -module firewall './firewall.bicep' = { +module firewall '../modules/firewall.bicep' = { name: 'firewall' params: { name: firewallName @@ -238,7 +238,7 @@ module firewall './firewall.bicep' = { } } -module azureMonitorPrivateLink './privateLink.bicep' = if ( contains(supportedClouds, environment().name) ){ +module azureMonitorPrivateLink '../modules/private-link.bicep' = if ( contains(supportedClouds, environment().name) ){ name: 'azure-monitor-private-link' params: { logAnalyticsWorkspaceName: logAnalyticsWorkspaceName diff --git a/src/bicep/modules/remoteAccess.bicep b/src/bicep/core/remote-access.bicep similarity index 92% rename from src/bicep/modules/remoteAccess.bicep rename to src/bicep/core/remote-access.bicep index 2be4ac77a..3fdcf3e77 100644 --- a/src/bicep/modules/remoteAccess.bicep +++ b/src/bicep/core/remote-access.bicep @@ -63,7 +63,7 @@ resource hubVirtualNetwork 'Microsoft.Network/virtualNetworks@2021-02-01' existi name: hubVirtualNetworkName } -module bastionHost './bastionHost.bicep' = { +module bastionHost '../modules/bastion-host.bicep' = { name: 'remoteAccess-bastionHost' params: { @@ -81,7 +81,7 @@ module bastionHost './bastionHost.bicep' = { } } -module linuxNetworkInterface './networkInterface.bicep' = { +module linuxNetworkInterface '../modules/network-interface.bicep' = { name: 'remoteAccess-linuxNetworkInterface' params: { name: linuxNetworkInterfaceName @@ -95,7 +95,7 @@ module linuxNetworkInterface './networkInterface.bicep' = { } } -module linuxVirtualMachine './linuxVirtualMachine.bicep' = { +module linuxVirtualMachine '../modules/linux-virtual-machine.bicep' = { name: 'remoteAccess-linuxVirtualMachine' params: { name: linuxVmName @@ -117,7 +117,7 @@ module linuxVirtualMachine './linuxVirtualMachine.bicep' = { } } -module windowsNetworkInterface './networkInterface.bicep' = { +module windowsNetworkInterface '../modules/network-interface.bicep' = { name: 'remoteAccess-windowsNetworkInterface' params: { name: windowsNetworkInterfaceName @@ -131,7 +131,7 @@ module windowsNetworkInterface './networkInterface.bicep' = { } } -module windowsVirtualMachine './windowsVirtualMachine.bicep' = { +module windowsVirtualMachine '../modules/windows-virtual-machine.bicep' = { name: 'remoteAccess-windowsVirtualMachine' params: { name: windowsVmName diff --git a/src/bicep/modules/spokeNetworkPeering.bicep b/src/bicep/core/spoke-network-peering.bicep similarity index 87% rename from src/bicep/modules/spokeNetworkPeering.bicep rename to src/bicep/core/spoke-network-peering.bicep index 4dc3e2539..e04bfd22f 100644 --- a/src/bicep/modules/spokeNetworkPeering.bicep +++ b/src/bicep/core/spoke-network-peering.bicep @@ -12,7 +12,7 @@ param spokeVirtualNetworkName string param hubVirtualNetworkName string param hubVirtualNetworkResourceId string -module spokeNetworkPeering './virtualNetworkPeering.bicep' = { +module spokeNetworkPeering '../modules/virtual-network-peering.bicep' = { name: '${spokeName}-to-hub-vnet-peering' scope: resourceGroup(spokeResourceGroupName) params: { diff --git a/src/bicep/modules/spokeNetwork.bicep b/src/bicep/core/spoke-network.bicep similarity index 92% rename from src/bicep/modules/spokeNetwork.bicep rename to src/bicep/core/spoke-network.bicep index 67c098415..385be9563 100644 --- a/src/bicep/modules/spokeNetwork.bicep +++ b/src/bicep/core/spoke-network.bicep @@ -34,7 +34,7 @@ param routeTableRouteAddressPrefix string = '0.0.0.0/0' param routeTableRouteNextHopIpAddress string = firewallPrivateIPAddress param routeTableRouteNextHopType string = 'VirtualAppliance' -module logStorage './storageAccount.bicep' = { +module logStorage '../modules/storage-account.bicep' = { name: 'logStorage' params: { storageAccountName: logStorageAccountName @@ -44,7 +44,7 @@ module logStorage './storageAccount.bicep' = { } } -module networkSecurityGroup './networkSecurityGroup.bicep' = { +module networkSecurityGroup '../modules/network-security-group.bicep' = { name: 'networkSecurityGroup' params: { name: networkSecurityGroupName @@ -61,7 +61,7 @@ module networkSecurityGroup './networkSecurityGroup.bicep' = { } } -module routeTable './routeTable.bicep' = { +module routeTable '../modules/route-table.bicep' = { name: 'routeTable' params: { name: routeTableName @@ -75,7 +75,7 @@ module routeTable './routeTable.bicep' = { } } -module virtualNetwork './virtualNetwork.bicep' = { +module virtualNetwork '../modules/virtual-network.bicep' = { name: 'virtualNetwork' params: { name: virtualNetworkName diff --git a/src/bicep/examples/README.md b/src/bicep/examples/README.md index 0ab8fb22e..8b6e8bd95 100644 --- a/src/bicep/examples/README.md +++ b/src/bicep/examples/README.md @@ -8,15 +8,13 @@ You [must first deploy MissionLZ](../README.md#Deployment), then you can deploy Example | Description ------- | ----------- -[appServicePlan](./appServicePlan) | Deploys an App Service Plan (AKA: Web Server Cluster) to support simple web accessible linux docker containers with optional dynamic auto scaling. -[Automation Account](./automationAccount) | Deploys an Azure Automation account that can be used to execute runbooks. -[Container Registry](./containerRegistry/) | Deploys an Azure Container Registry for holding and deploying docker containers. -[Inherit Tags](./inheritTags) | Adds or replaces a specified tag and value from the parent resource group when any resource is created or updated. -[KeyVault](./keyVault/) | Deploys a premium Azure Key Vault with RBAC enabled to support secret, key, and certificate management. -[New Workload](./newWorkload) | Adds a new Spoke Network and peers it to the Hub Network routing all traffic to the Azure Firewall. -[Remote Access](./remoteAccess) | Adds a Bastion Host and a virtual machine to serve as a jumpbox into the network. +[appServicePlan](./app-service-plan) | Deploys an App Service Plan (AKA: Web Server Cluster) to support simple web accessible linux docker containers with optional dynamic auto scaling. +[Automation Account](./automation-account) | Deploys an Azure Automation account that can be used to execute runbooks. +[Container Registry](./container-registry/) | Deploys an Azure Container Registry for holding and deploying docker containers. +[Inherit Tags](./inherit-tags) | Adds or replaces a specified tag and value from the parent resource group when any resource is created or updated. +[KeyVault](./key-vault/) | Deploys a premium Azure Key Vault with RBAC enabled to support secret, key, and certificate management. [Azure Sentinel](./sentinel) | A Terraform module that adds an Azure Sentinel solution to a Log Analytics Workspace. Sentinel can also be deployed via bicep and the base deployment of mlz.bicep by using the boolean param '-deploySentinel'. -[Zero Trust (TIC3.0) Workbook](./zeroTrustWorkbook) | Deploys an Azure Sentinel Zero Trust (TIC3.0) Workbook +[Zero Trust (TIC3.0) Workbook](./zero-trust-workbook) | Deploys an Azure Sentinel Zero Trust (TIC3.0) Workbook ## Shared Variable File Pattern (deploymentVariables.json) diff --git a/src/bicep/examples/appServicePlan/README.md b/src/bicep/examples/app-service-plan/README.md similarity index 100% rename from src/bicep/examples/appServicePlan/README.md rename to src/bicep/examples/app-service-plan/README.md diff --git a/src/bicep/examples/appServicePlan/appService.bicep b/src/bicep/examples/app-service-plan/app-service.bicep similarity index 91% rename from src/bicep/examples/appServicePlan/appService.bicep rename to src/bicep/examples/app-service-plan/app-service.bicep index 86c43c9d1..2bfaed3cf 100644 --- a/src/bicep/examples/appServicePlan/appService.bicep +++ b/src/bicep/examples/app-service-plan/app-service.bicep @@ -21,6 +21,9 @@ param enableAutoScale bool = true @description('Defines the performance tier of your web farm. By default the performance scale will be premium 2nd generation version 2 "p2v2". Another value would be standard generation 2 "s2".') param appServiceSkuName string = 'p2v2' +@description('The deployment location being deployed to.') +param location string = deployment().location + @description('A string dictionary of tags to add to deployed resources. See https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources?tabs=json#arm-templates for valid settings.') param tags object = {} var defaultTags = { @@ -29,7 +32,7 @@ var defaultTags = { var calculatedTags = union(tags, defaultTags) var targetSubscriptionId_Var = targetResourceGroup == '${mlzDeploymentVariables.spokes.Value[2].resourceGroupName}' ? '${mlzDeploymentVariables.spokes.Value[2].subscriptionId}' : subscription().subscriptionId -var location = deployment().location + var kind = 'linux' var capacity = 2 @@ -39,7 +42,7 @@ resource targetASPResourceGroup 'Microsoft.Resources/resourceGroups@2020-10-01' tags: calculatedTags } -module appServicePlan 'modules/appServicePlan.bicep' = { +module appServicePlan './modules/app-service-plan.bicep' = { name: appServicePlanName scope: resourceGroup(targetSubscriptionId_Var, targetASPResourceGroup.name) params: { @@ -52,7 +55,7 @@ module appServicePlan 'modules/appServicePlan.bicep' = { } } -module appServicePlanSettings 'modules/appServiceSettings.bicep' = if (enableAutoScale) { +module appServicePlanSettings './modules/app-service-settings.bicep' = if (enableAutoScale) { name: 'appServicePlanSettingsName' scope: resourceGroup(targetSubscriptionId_Var, targetASPResourceGroup.name) params: { diff --git a/src/bicep/examples/appServicePlan/modules/appServicePlan.bicep b/src/bicep/examples/app-service-plan/modules/app-service-plan.bicep similarity index 100% rename from src/bicep/examples/appServicePlan/modules/appServicePlan.bicep rename to src/bicep/examples/app-service-plan/modules/app-service-plan.bicep diff --git a/src/bicep/examples/appServicePlan/modules/appServiceSettings.bicep b/src/bicep/examples/app-service-plan/modules/app-service-settings.bicep similarity index 100% rename from src/bicep/examples/appServicePlan/modules/appServiceSettings.bicep rename to src/bicep/examples/app-service-plan/modules/app-service-settings.bicep diff --git a/src/bicep/examples/automationAccount/README.md b/src/bicep/examples/automation-account/README.md similarity index 92% rename from src/bicep/examples/automationAccount/README.md rename to src/bicep/examples/automation-account/README.md index bde68f6ad..f2168c373 100644 --- a/src/bicep/examples/automationAccount/README.md +++ b/src/bicep/examples/automation-account/README.md @@ -42,7 +42,7 @@ New-AzSubscriptionDeployment -Name contoso -TemplateFile .\mlz.bicep -resourcePr cd .\examples (Get-AzSubscriptionDeployment -Name contoso).outputs | ConvertTo-Json | Out-File -FilePath .\deploymentVariables.json cd .\automationAccount -New-AzSubscriptionDeployment -DeploymentName deployAzureAUtomationt -TemplateFile .\automationAccount.bicep -Location 'eastus' +New-AzSubscriptionDeployment -DeploymentName deployAzureAutomation -TemplateFile .\automation-account.bicep -Location 'eastus' ``` ```Azure CLI @@ -52,7 +52,7 @@ az deployment sub create -n contoso -f mlz.bicep -l eastus --parameters resource cd examples az deployment sub show -n contoso --query properties.outputs > ./deploymentVariables.json cd automationAccount -az deployment sub create -n deployAzureAutomation -f automationAccount.bicep -l eastus +az deployment sub create -n deployAzureAutomation -f automation-account.bicep -l eastus ``` ### References diff --git a/src/bicep/examples/automationAccount/automationAccount.bicep b/src/bicep/examples/automation-account/automation-account.bicep similarity index 97% rename from src/bicep/examples/automationAccount/automationAccount.bicep rename to src/bicep/examples/automation-account/automation-account.bicep index fc8f8ed68..318bcdc63 100644 --- a/src/bicep/examples/automationAccount/automationAccount.bicep +++ b/src/bicep/examples/automation-account/automation-account.bicep @@ -29,7 +29,7 @@ resource targetAAResourceGroup 'Microsoft.Resources/resourceGroups@2020-10-01' e name: targetResourceGroup } -module automationAccount './modules/automationAccount.bicep' = { +module automationAccount './modules/automation-account.bicep' = { scope: resourceGroup(targetSubscriptionId_Var, targetAAResourceGroup.name) name: automationAcctName params: { diff --git a/src/bicep/examples/automationAccount/modules/automationAccount.bicep b/src/bicep/examples/automation-account/modules/automation-account.bicep similarity index 100% rename from src/bicep/examples/automationAccount/modules/automationAccount.bicep rename to src/bicep/examples/automation-account/modules/automation-account.bicep diff --git a/src/bicep/examples/containerRegistry/README.md b/src/bicep/examples/container-registry/README.md similarity index 95% rename from src/bicep/examples/containerRegistry/README.md rename to src/bicep/examples/container-registry/README.md index 976574e57..eab7e3b7e 100644 --- a/src/bicep/examples/containerRegistry/README.md +++ b/src/bicep/examples/container-registry/README.md @@ -43,7 +43,7 @@ New-AzSubscriptionDeployment -Name contoso -TemplateFile .\mlz.bicep -resourcePr cd .\examples (Get-AzSubscriptionDeployment -Name contoso).outputs | ConvertTo-Json | Out-File -FilePath .\deploymentVariables.json cd .\containerRegistry -New-AzSubscriptionDeployment -DeploymentName deployContainerRegistry -TemplateFile .\contRegistry.bicep -Location 'eastus' +New-AzSubscriptionDeployment -DeploymentName deployContainerRegistry -TemplateFile .\container-registry.bicep -Location 'eastus' ``` ```Azure CLI @@ -53,7 +53,7 @@ az deployment sub create -n contoso -f mlz.bicep -l eastus --parameters resource cd examples az deployment sub show -n contoso --query properties.outputs > ./deploymentVariables.json cd containerRegistry -az deployment sub create -n deployContainerRegistry -f contRegistry.bicep -l eastus +az deployment sub create -n deployContainerRegistry -f container-registry.bicep -l eastus ``` ### References diff --git a/src/bicep/examples/containerRegistry/contRegistry.bicep b/src/bicep/examples/container-registry/container-registry.bicep similarity index 96% rename from src/bicep/examples/containerRegistry/contRegistry.bicep rename to src/bicep/examples/container-registry/container-registry.bicep index 6c28ab7ee..5e09948c9 100644 --- a/src/bicep/examples/containerRegistry/contRegistry.bicep +++ b/src/bicep/examples/container-registry/container-registry.bicep @@ -30,7 +30,7 @@ resource targetACRResourceGroup 'Microsoft.Resources/resourceGroups@2020-10-01' tags: calculatedTags } -module containerRegistry 'modules/containerRegistry.bicep' = { +module containerRegistry 'modules/container-registry.bicep' = { scope: resourceGroup(targetSubscriptionId_Var, targetACRResourceGroup.name) name: contRegistryName params: { diff --git a/src/bicep/examples/containerRegistry/modules/containerRegistry.bicep b/src/bicep/examples/container-registry/modules/container-registry.bicep similarity index 100% rename from src/bicep/examples/containerRegistry/modules/containerRegistry.bicep rename to src/bicep/examples/container-registry/modules/container-registry.bicep diff --git a/src/bicep/examples/inheritTags/README.md b/src/bicep/examples/inherit-tags/README.md similarity index 98% rename from src/bicep/examples/inheritTags/README.md rename to src/bicep/examples/inherit-tags/README.md index 9d1711b6e..34d0ce2a7 100644 --- a/src/bicep/examples/inheritTags/README.md +++ b/src/bicep/examples/inherit-tags/README.md @@ -35,7 +35,7 @@ tagInherit="yourTaghere" az deployment group create \ --name "InheritTagExample" \ - --template-file "./inherit.bicep" \ + --template-file "./inherit-tags.bicep" \ --resource-group "resourceGroupName" \ --parameters \ tagNameInherit=$tagInherit diff --git a/src/bicep/examples/inheritTags/inherit.bicep b/src/bicep/examples/inherit-tags/inherit-tags.bicep similarity index 100% rename from src/bicep/examples/inheritTags/inherit.bicep rename to src/bicep/examples/inherit-tags/inherit-tags.bicep diff --git a/src/bicep/examples/keyVault/README.md b/src/bicep/examples/key-vault/README.md similarity index 97% rename from src/bicep/examples/keyVault/README.md rename to src/bicep/examples/key-vault/README.md index de56524f4..6f9f6abaa 100644 --- a/src/bicep/examples/keyVault/README.md +++ b/src/bicep/examples/key-vault/README.md @@ -53,7 +53,7 @@ az deployment sub create -n contoso -f mlz.bicep -l eastus --parameters resource cd examples az deployment sub show -n contoso --query properties.outputs > ./deploymentVariables.json cd keyVault -az deployment sub create -n deployAzureKeyVault -f azureKeyVault.bicep -l eastus +az deployment sub create -n deployAzureKeyVault -f key-vault.bicep -l eastus ``` ### References diff --git a/src/bicep/examples/keyVault/azureKeyVault.bicep b/src/bicep/examples/key-vault/key-vault.bicep similarity index 97% rename from src/bicep/examples/keyVault/azureKeyVault.bicep rename to src/bicep/examples/key-vault/key-vault.bicep index f0cd0b7cf..da768be1b 100644 --- a/src/bicep/examples/keyVault/azureKeyVault.bicep +++ b/src/bicep/examples/key-vault/key-vault.bicep @@ -29,7 +29,7 @@ resource targetASPResourceGroup 'Microsoft.Resources/resourceGroups@2020-10-01' location: location } -module deployAzureKeyVault 'modules/keyVault.bicep' = { +module deployAzureKeyVault 'modules/key-vault.bicep' = { scope: resourceGroup(targetSubscriptionId_Var, targetASPResourceGroup.name) name: keyVaultName params: { diff --git a/src/bicep/examples/keyVault/modules/keyVault.bicep b/src/bicep/examples/key-vault/modules/key-vault.bicep similarity index 100% rename from src/bicep/examples/keyVault/modules/keyVault.bicep rename to src/bicep/examples/key-vault/modules/key-vault.bicep diff --git a/src/bicep/examples/zeroTrustWorkbook/README.md b/src/bicep/examples/zero-trust-workbook/README.md similarity index 100% rename from src/bicep/examples/zeroTrustWorkbook/README.md rename to src/bicep/examples/zero-trust-workbook/README.md diff --git a/src/bicep/mlz.bicep b/src/bicep/mlz.bicep index 404a3cec8..55e175ab3 100644 --- a/src/bicep/mlz.bicep +++ b/src/bicep/mlz.bicep @@ -718,7 +718,7 @@ var calculatedTags = union(tags, defaultTags) // RESOURCE GROUPS -module hubResourceGroup './modules/resourceGroup.bicep' = { +module hubResourceGroup './modules/resource-group.bicep' = { name: 'deploy-rg-hub-${deploymentNameSuffix}' scope: subscription(hubSubscriptionId) params: { @@ -728,7 +728,7 @@ module hubResourceGroup './modules/resourceGroup.bicep' = { } } -module spokeResourceGroups './modules/resourceGroup.bicep' = [for spoke in spokes: { +module spokeResourceGroups './modules/resource-group.bicep' = [for spoke in spokes: { name: 'deploy-rg-${spoke.name}-${deploymentNameSuffix}' scope: subscription(spoke.subscriptionId) params: { @@ -740,7 +740,7 @@ module spokeResourceGroups './modules/resourceGroup.bicep' = [for spoke in spoke // LOG ANALYTICS WORKSPACE -module logAnalyticsWorkspace './modules/logAnalyticsWorkspace.bicep' = { +module logAnalyticsWorkspace './modules/log-analytics-workspace.bicep' = { name: 'deploy-laws-${deploymentNameSuffix}' scope: resourceGroup(operationsSubscriptionId, operationsResourceGroupName) params: { @@ -759,7 +759,7 @@ module logAnalyticsWorkspace './modules/logAnalyticsWorkspace.bicep' = { // HUB AND SPOKE NETWORKS -module hubNetwork './modules/hubNetwork.bicep' = { +module hubNetwork './core/hub-network.bicep' = { name: 'deploy-vnet-hub-${deploymentNameSuffix}' scope: resourceGroup(hubSubscriptionId, hubResourceGroupName) params: { @@ -816,7 +816,7 @@ module hubNetwork './modules/hubNetwork.bicep' = { } } -module spokeNetworks './modules/spokeNetwork.bicep' = [for spoke in spokes: { +module spokeNetworks './core/spoke-network.bicep' = [for spoke in spokes: { name: 'deploy-vnet-${spoke.name}-${deploymentNameSuffix}' scope: resourceGroup(spoke.subscriptionId, spoke.resourceGroupName) params: { @@ -848,7 +848,7 @@ module spokeNetworks './modules/spokeNetwork.bicep' = [for spoke in spokes: { // VIRTUAL NETWORK PEERINGS -module hubVirtualNetworkPeerings './modules/hubNetworkPeerings.bicep' = { +module hubVirtualNetworkPeerings './core/hub-network-peerings.bicep' = { name: 'deploy-vnet-peerings-hub-${deploymentNameSuffix}' scope: resourceGroup(hubSubscriptionId, hubResourceGroupName) params: { @@ -861,7 +861,7 @@ module hubVirtualNetworkPeerings './modules/hubNetworkPeerings.bicep' = { } } -module spokeVirtualNetworkPeerings './modules/spokeNetworkPeering.bicep' = [for (spoke, i) in spokes: { +module spokeVirtualNetworkPeerings './core/spoke-network-peering.bicep' = [for (spoke, i) in spokes: { name: 'deploy-vnet-peerings-${spoke.name}-${deploymentNameSuffix}' scope: subscription(spoke.subscriptionId) params: { @@ -875,7 +875,7 @@ module spokeVirtualNetworkPeerings './modules/spokeNetworkPeering.bicep' = [for // POLICY ASSIGNMENTS -module hubPolicyAssignment './modules/policyAssignment.bicep' = if (deployPolicy) { +module hubPolicyAssignment './modules/policy-assignment.bicep' = if (deployPolicy) { name: 'assign-policy-hub-${deploymentNameSuffix}' scope: resourceGroup(hubSubscriptionId, hubResourceGroupName) params: { @@ -887,7 +887,7 @@ module hubPolicyAssignment './modules/policyAssignment.bicep' = if (deployPolicy } } -module spokePolicyAssignments './modules/policyAssignment.bicep' = [for spoke in spokes: if (deployPolicy) { +module spokePolicyAssignments './modules/policy-assignment.bicep' = [for spoke in spokes: if (deployPolicy) { name: 'assign-policy-${spoke.name}-${deploymentNameSuffix}' scope: resourceGroup(spoke.subscriptionId, spoke.resourceGroupName) params: { @@ -901,7 +901,7 @@ module spokePolicyAssignments './modules/policyAssignment.bicep' = [for spoke in // CENTRAL LOGGING -module hubSubscriptionActivityLogging './modules/centralLogging.bicep' = { +module hubSubscriptionActivityLogging './modules/central-logging.bicep' = { name: 'activity-logs-hub-${deploymentNameSuffix}' scope: subscription(hubSubscriptionId) params: { @@ -913,7 +913,7 @@ module hubSubscriptionActivityLogging './modules/centralLogging.bicep' = { ] } -module spokeSubscriptionActivityLogging './modules/centralLogging.bicep' = [for spoke in spokes: if (spoke.subscriptionId != hubSubscriptionId) { +module spokeSubscriptionActivityLogging './modules/central-logging.bicep' = [for spoke in spokes: if (spoke.subscriptionId != hubSubscriptionId) { name: 'activity-logs-${spoke.name}-${deploymentNameSuffix}' scope: subscription(spoke.subscriptionId) params: { @@ -925,7 +925,7 @@ module spokeSubscriptionActivityLogging './modules/centralLogging.bicep' = [for ] }] -module logAnalyticsDiagnosticLogging './modules/logAnalyticsDiagnosticLogging.bicep' = { +module logAnalyticsDiagnosticLogging './modules/log-analytics-diagnostic-logging.bicep' = { name: 'deploy-diagnostic-logging-${deploymentNameSuffix}' scope: resourceGroup(operationsSubscriptionId, operationsResourceGroupName) params: { @@ -960,7 +960,7 @@ module spokeDefender './modules/defender.bicep' = [for spoke in spokes: if ((dep // REMOTE ACCESS -module remoteAccess './modules/remoteAccess.bicep' = if (deployRemoteAccess) { +module remoteAccess './core/remote-access.bicep' = if (deployRemoteAccess) { name: 'deploy-remote-access-${deploymentNameSuffix}' scope: resourceGroup(hubSubscriptionId, hubResourceGroupName) diff --git a/src/bicep/modules/README.md b/src/bicep/modules/README.md new file mode 100644 index 000000000..ca181b9c8 --- /dev/null +++ b/src/bicep/modules/README.md @@ -0,0 +1,5 @@ +# Mission Landing Zone ModuleBicep Templates + +This folder contains opinionated module definitions used for deploying MLZ, they are referenced by the primary mlz.bicep as well as the [Core](../core/) bicep templates. + +See the [Deployment Guide for Bicep](../../docs/deployment-guide-bicep.md) for detailed instructions on how to use these templates. diff --git a/src/bicep/modules/bastionHost.bicep b/src/bicep/modules/bastion-host.bicep similarity index 100% rename from src/bicep/modules/bastionHost.bicep rename to src/bicep/modules/bastion-host.bicep diff --git a/src/bicep/modules/centralLogging.bicep b/src/bicep/modules/central-logging.bicep similarity index 100% rename from src/bicep/modules/centralLogging.bicep rename to src/bicep/modules/central-logging.bicep diff --git a/src/bicep/modules/linuxVirtualMachine.bicep b/src/bicep/modules/linux-virtual-machine.bicep similarity index 100% rename from src/bicep/modules/linuxVirtualMachine.bicep rename to src/bicep/modules/linux-virtual-machine.bicep diff --git a/src/bicep/modules/logAnalyticsDiagnosticLogging.bicep b/src/bicep/modules/log-analytics-diagnostic-logging.bicep similarity index 100% rename from src/bicep/modules/logAnalyticsDiagnosticLogging.bicep rename to src/bicep/modules/log-analytics-diagnostic-logging.bicep diff --git a/src/bicep/modules/logAnalyticsWorkspace.bicep b/src/bicep/modules/log-analytics-workspace.bicep similarity index 100% rename from src/bicep/modules/logAnalyticsWorkspace.bicep rename to src/bicep/modules/log-analytics-workspace.bicep diff --git a/src/bicep/modules/networkInterface.bicep b/src/bicep/modules/network-interface.bicep similarity index 100% rename from src/bicep/modules/networkInterface.bicep rename to src/bicep/modules/network-interface.bicep diff --git a/src/bicep/modules/networkSecurityGroup.bicep b/src/bicep/modules/network-security-group.bicep similarity index 100% rename from src/bicep/modules/networkSecurityGroup.bicep rename to src/bicep/modules/network-security-group.bicep diff --git a/src/bicep/modules/policyAssignment.bicep b/src/bicep/modules/policy-assignment.bicep similarity index 98% rename from src/bicep/modules/policyAssignment.bicep rename to src/bicep/modules/policy-assignment.bicep index 49db1eb7b..ef902fdfe 100644 --- a/src/bicep/modules/policyAssignment.bicep +++ b/src/bicep/modules/policy-assignment.bicep @@ -123,7 +123,7 @@ resource vmPolicyRoleAssignment 'Microsoft.Authorization/roleAssignments@2020-04 } } -module roleAssignment '../modules/roleAssignment.bicep' = { +module roleAssignment '../modules/role-assignment.bicep' = { name: 'Assign-Laws-Role-Policy-${resourceGroup().name}' scope: resourceGroup(operationsSubscriptionId, logAnalyticsWorkspaceResourceGroupName) params: { diff --git a/src/bicep/modules/privateLink.bicep b/src/bicep/modules/private-link.bicep similarity index 100% rename from src/bicep/modules/privateLink.bicep rename to src/bicep/modules/private-link.bicep diff --git a/src/bicep/modules/publicIPAddress.bicep b/src/bicep/modules/public-ip-address.bicep similarity index 100% rename from src/bicep/modules/publicIPAddress.bicep rename to src/bicep/modules/public-ip-address.bicep diff --git a/src/bicep/modules/resourceGroup.bicep b/src/bicep/modules/resource-group.bicep similarity index 100% rename from src/bicep/modules/resourceGroup.bicep rename to src/bicep/modules/resource-group.bicep diff --git a/src/bicep/modules/roleAssignment.bicep b/src/bicep/modules/role-assignment.bicep similarity index 100% rename from src/bicep/modules/roleAssignment.bicep rename to src/bicep/modules/role-assignment.bicep diff --git a/src/bicep/modules/routeTable.bicep b/src/bicep/modules/route-table.bicep similarity index 100% rename from src/bicep/modules/routeTable.bicep rename to src/bicep/modules/route-table.bicep diff --git a/src/bicep/modules/storageAccount.bicep b/src/bicep/modules/storage-account.bicep similarity index 100% rename from src/bicep/modules/storageAccount.bicep rename to src/bicep/modules/storage-account.bicep diff --git a/src/bicep/modules/virtualNetworkPeering.bicep b/src/bicep/modules/virtual-network-peering.bicep similarity index 100% rename from src/bicep/modules/virtualNetworkPeering.bicep rename to src/bicep/modules/virtual-network-peering.bicep diff --git a/src/bicep/modules/virtualNetwork.bicep b/src/bicep/modules/virtual-network.bicep similarity index 100% rename from src/bicep/modules/virtualNetwork.bicep rename to src/bicep/modules/virtual-network.bicep diff --git a/src/bicep/modules/windowsVirtualMachine.bicep b/src/bicep/modules/windows-virtual-machine.bicep similarity index 100% rename from src/bicep/modules/windowsVirtualMachine.bicep rename to src/bicep/modules/windows-virtual-machine.bicep