From cc58dddf253927bed6e78a4ad4ebf7a1e9fb2d6f Mon Sep 17 00:00:00 2001
From: Jack Tracey <41163455+jtracey93@users.noreply.github.com>
Date: Wed, 3 May 2023 21:18:46 +0100
Subject: [PATCH] Minor Tweaks (#521)

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
---
 .../bicep/modules/hubNetworking/hubNetworking.bicep   | 11 +++++++++--
 .../modules/logging/generateddocs/logging.bicep.md    |  2 +-
 infra-as-code/bicep/modules/logging/logging.bicep     |  1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/infra-as-code/bicep/modules/hubNetworking/hubNetworking.bicep b/infra-as-code/bicep/modules/hubNetworking/hubNetworking.bicep
index 9ad013270..74716392e 100644
--- a/infra-as-code/bicep/modules/hubNetworking/hubNetworking.bicep
+++ b/infra-as-code/bicep/modules/hubNetworking/hubNetworking.bicep
@@ -253,9 +253,16 @@ param parTags object = {}
 param parTelemetryOptOut bool = false
 
 @sys.description('Define outbound destination ports or ranges for SSH or RDP that you want to access from Azure Bastion.')
-param parBastionOutboundSshRdpPorts array = ['22','3389']
+param parBastionOutboundSshRdpPorts array = [ '22', '3389' ]
 
-var varSubnetProperties = [for subnet in parSubnets: {
+var varSubnetMap = map(range(0, length(parSubnets)), i => {
+    name: parSubnets[i].name
+    ipAddressRange: parSubnets[i].ipAddressRange
+    networkSecurityGroupId: contains(parSubnets[i], 'networkSecurityGroupId') ? parSubnets[i].networkSecurityGroupId : ''
+    routeTableId: contains(parSubnets[i], 'routeTableId') ? parSubnets[i].routeTableId : ''
+  })
+
+var varSubnetProperties = [for subnet in varSubnetMap: {
   name: subnet.name
   properties: {
     addressPrefix: subnet.ipAddressRange
diff --git a/infra-as-code/bicep/modules/logging/generateddocs/logging.bicep.md b/infra-as-code/bicep/modules/logging/generateddocs/logging.bicep.md
index 6387c501b..a2d6abd7f 100644
--- a/infra-as-code/bicep/modules/logging/generateddocs/logging.bicep.md
+++ b/infra-as-code/bicep/modules/logging/generateddocs/logging.bicep.md
@@ -61,7 +61,7 @@ Solutions that will be added to the Log Analytics Workspace.
 
 - Default value: `AgentHealthAssessment AntiMalware ChangeTracking Security SecurityInsights SQLAdvancedThreatProtection SQLVulnerabilityAssessment SQLAssessment Updates VMInsights`
 
-- Allowed values: `AgentHealthAssessment`, `AntiMalware`, `ChangeTracking`, `Security`, `SecurityInsights`, `SQLAdvancedThreatProtection`, `SQLVulnerabilityAssessment`, `SQLAssessment`, `Updates`, `VMInsights`
+- Allowed values: `AgentHealthAssessment`, `AntiMalware`, `ChangeTracking`, `Security`, `SecurityInsights`, `ServiceMap`, `SQLAdvancedThreatProtection`, `SQLVulnerabilityAssessment`, `SQLAssessment`, `Updates`, `VMInsights`
 
 ### parAutomationAccountName
 
diff --git a/infra-as-code/bicep/modules/logging/logging.bicep b/infra-as-code/bicep/modules/logging/logging.bicep
index 2dd2c42c6..a148c1bf6 100644
--- a/infra-as-code/bicep/modules/logging/logging.bicep
+++ b/infra-as-code/bicep/modules/logging/logging.bicep
@@ -31,6 +31,7 @@ param parLogAnalyticsWorkspaceLogRetentionInDays int = 365
   'ChangeTracking'
   'Security'
   'SecurityInsights'
+  'ServiceMap'
   'SQLAdvancedThreatProtection'
   'SQLVulnerabilityAssessment'
   'SQLAssessment'