Merge branch 'main' into issue/625

Azure · Nov 13, 2023 · 016a826 · 016a826
2 parents d95225f + 328a18b
commit 016a826
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/infra-as-code/bicep/modules/logging/generateddocs/logging.bicep.md b/infra-as-code/bicep/modules/logging/generateddocs/logging.bicep.md
@@ -16,6 +16,7 @@ parLogAnalyticsWorkspaceLinkAutomationAccount | No       | Log Analytics Workspa
 parAutomationAccountName | No       | Automation account name.
 parAutomationAccountLocation | No       | Automation Account region name. - Ensure the regions selected is a supported mapping as per: https://docs.microsoft.com/azure/automation/how-to/region-mappings.
 parAutomationAccountUseManagedIdentity | No       | Automation Account - use managed identity.
+parAutomationAccountPublicNetworkAccess | No       | Automation Account - Public network access.
 parTags        | No       | Tags you would like to be applied to all resources in this module.
 parAutomationAccountTags | No       | Tags you would like to be applied to Automation Account.
 parLogAnalyticsWorkspaceTags | No       | Tags you would like to be applied to Log Analytics Workspace.
@@ -109,6 +110,14 @@ Automation Account - use managed identity.
 
 - Default value: `True`
 
+### parAutomationAccountPublicNetworkAccess
+
+![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)
+
+Automation Account - Public network access.
+
+- Default value: `True`
+
 ### parTags
 
 ![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)
@@ -219,6 +228,9 @@ outAutomationAccountId | string |
         "parAutomationAccountUseManagedIdentity": {
             "value": true
         },
+        "parAutomationAccountPublicNetworkAccess": {
+            "value": true
+        },
         "parTags": {
             "value": {}
         },

diff --git a/infra-as-code/bicep/modules/logging/logging.bicep b/infra-as-code/bicep/modules/logging/logging.bicep
@@ -77,6 +77,9 @@ param parAutomationAccountLocation string = resourceGroup().location
 @sys.description('Automation Account - use managed identity.')
 param parAutomationAccountUseManagedIdentity bool = true
 
+@sys.description('Automation Account - Public network access.')
+param parAutomationAccountPublicNetworkAccess bool = true
+
 @sys.description('Tags you would like to be applied to all resources in this module.')
 param parTags object = {}
 
@@ -106,12 +109,13 @@ resource resAutomationAccount 'Microsoft.Automation/automationAccounts@2022-08-0
     type: 'SystemAssigned'
   } : null
   properties: {
-    sku: {
-      name: 'Basic'
-    }
     encryption: {
       keySource: 'Microsoft.Automation'
     }
+    publicNetworkAccess: parAutomationAccountPublicNetworkAccess
+    sku: {
+      name: 'Basic'
+    }
   }
 }
 

diff --git a/infra-as-code/bicep/modules/logging/parameters/logging.parameters.all.json b/infra-as-code/bicep/modules/logging/parameters/logging.parameters.all.json
@@ -43,6 +43,9 @@
     "parAutomationAccountUseManagedIdentity": {
       "value": true
     },
+    "parAutomationAccountPublicNetworkAccess": {
+      "value": true
+    },
     "parTags": {
       "value": {
         "Environment": "Live"

diff --git a/infra-as-code/bicep/modules/logging/parameters/mc-logging.parameters.all.json b/infra-as-code/bicep/modules/logging/parameters/mc-logging.parameters.all.json
@@ -40,6 +40,9 @@
     "parAutomationAccountUseManagedIdentity": {
       "value": true
     },
+    "parAutomationAccountPublicNetworkAccess": {
+      "value": true
+    },
     "parTags": {
       "value": {
         "Environment": "Live"