Merge branch 'main' into arm-template-size

Azure · Aug 21, 2024 · c8e4cae · c8e4cae
2 parents 6ee4036 + 73ae4a2
commit c8e4cae
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 13 deletions.
diff --git a/infra-as-code/bicep/bicepconfig.json b/infra-as-code/bicep/bicepconfig.json
@@ -13,6 +13,12 @@
         "decompiler-cleanup": {
           "level": "error"
         },
+        "explicit-values-for-loc-params": {
+          "level": "off"
+        },
+        "max-asserts": {
+          "level": "warning"
+        },
         "max-outputs": {
           "level": "error"
         },
@@ -25,6 +31,15 @@
         "max-variables": {
           "level": "error"
         },
+        "nested-deployment-template-scoping": {
+          "level": "error"
+        },
+        "no-conflicting-metadata" : {
+          "level": "warning"
+        },
+        "no-deployments-resources" : {
+          "level": "error"
+        },
         "no-hardcoded-env-urls": {
           "level": "error"
         },
@@ -80,12 +95,21 @@
           "level": "warning",
           "maxAllowedAgeInDays": 730
         },
+        "use-recent-module-versions": {
+          "level": "warning"
+        },
         "use-resource-id-functions": {
           "level": "error"
         },
         "use-resource-symbol-reference": {
           "level": "error"
         },
+        "use-safe-access": {
+          "level": "warning"
+        },
+        "use-secure-value-for-secure-inputs": {
+          "level": "error"
+        },
         "use-stable-resource-identifiers": {
           "level": "error"
         },

diff --git a/infra-as-code/bicep/modules/hubNetworking/hubNetworking.bicep b/infra-as-code/bicep/modules/hubNetworking/hubNetworking.bicep
@@ -406,9 +406,9 @@ param parBastionOutboundSshRdpPorts array = [ '22', '3389' ]
 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 : ''
-    delegation: contains(parSubnets[i], 'delegation') ? parSubnets[i].delegation : ''
+    networkSecurityGroupId: parSubnets[i].?networkSecurityGroupId ?? ''
+    routeTableId: parSubnets[i].?routeTableId ?? ''
+    delegation: parSubnets[i].?delegation ?? ''
   })
 
 var varSubnetProperties = [for subnet in varSubnetMap: {
@@ -770,15 +770,15 @@ resource resGateway 'Microsoft.Network/virtualNetworkGateways@2023-02-01' = [for
       tier: gateway.sku
     }
     vpnClientConfiguration: (toLower(gateway.gatewayType) == 'vpn') ? {
-      vpnClientAddressPool: contains(gateway.vpnClientConfiguration, 'vpnClientAddressPool') ? gateway.vpnClientConfiguration.vpnClientAddressPool : ''
-      vpnClientProtocols: contains(gateway.vpnClientConfiguration, 'vpnClientProtocols') ? gateway.vpnClientConfiguration.vpnClientProtocols : ''
-      vpnAuthenticationTypes: contains(gateway.vpnClientConfiguration, 'vpnAuthenticationTypes') ? gateway.vpnClientConfiguration.vpnAuthenticationTypes : ''
-      aadTenant: contains(gateway.vpnClientConfiguration, 'aadTenant') ? gateway.vpnClientConfiguration.aadTenant : ''
-      aadAudience: contains(gateway.vpnClientConfiguration, 'aadAudience') ? gateway.vpnClientConfiguration.aadAudience : ''
-      aadIssuer: contains(gateway.vpnClientConfiguration, 'aadIssuer') ? gateway.vpnClientConfiguration.aadIssuer : ''
-      vpnClientRootCertificates: contains(gateway.vpnClientConfiguration, 'vpnClientRootCertificates') ? gateway.vpnClientConfiguration.vpnClientRootCertificates : ''
-      radiusServerAddress: contains(gateway.vpnClientConfiguration, 'radiusServerAddress') ? gateway.vpnClientConfiguration.radiusServerAddress : ''
-      radiusServerSecret: contains(gateway.vpnClientConfiguration, 'radiusServerSecret') ? gateway.vpnClientConfiguration.radiusServerSecret : ''
+      vpnClientAddressPool: gateway.vpnClientConfiguration.?vpnClientAddressPool ?? ''
+      vpnClientProtocols: gateway.vpnClientConfiguration.?vpnClientProtocols ?? ''
+      vpnAuthenticationTypes: gateway.vpnClientConfiguration.?vpnAuthenticationTypes ?? ''
+      aadTenant: gateway.vpnClientConfiguration.?aadTenant ?? ''
+      aadAudience: gateway.vpnClientConfiguration.?aadAudience ?? ''
+      aadIssuer: gateway.vpnClientConfiguration.?aadIssuer ?? ''
+      vpnClientRootCertificates: gateway.vpnClientConfiguration.?vpnClientRootCertificates ?? ''
+      radiusServerAddress: gateway.vpnClientConfiguration.?radiusServerAddress ?? ''
+      radiusServerSecret: gateway.vpnClientConfiguration.?radiusServerSecret ?? ''
     } : null
     ipConfigurations: [
       {

diff --git a/infra-as-code/bicep/modules/logging/logging.bicep b/infra-as-code/bicep/modules/logging/logging.bicep
@@ -189,7 +189,7 @@ resource resUserAssignedManagedIdentity 'Microsoft.ManagedIdentity/userAssignedI
   location: parUserAssignedManagedIdentityLocation
 }
 
-resource resAutomationAccount 'Microsoft.Automation/automationAccounts@2022-08-08' = {
+resource resAutomationAccount 'Microsoft.Automation/automationAccounts@2023-11-01' = {
   name: parAutomationAccountName
   location: parAutomationAccountLocation
   tags: parAutomationAccountTags