Skip to content

[Modules] Adding Standard SKU Options to bastionHosts #1801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahmadabdalla merged 2 commits into from
Aug 26, 2022
Merged

[Modules] Adding Standard SKU Options to bastionHosts #1801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
765546c
Added options for Native
ChrisSidebotham Aug 25, 2022
7367fce
updated params & readme.md
ChrisSidebotham Aug 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions modules/Microsoft.Network/bastionHosts/.test/parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,18 @@
"scaleUnits": {
"value": 4
},
"disableCopyPaste": {
"value": true
},
"enableFileCopy": {
"value": false
},
"enableIpConnect": {
"value": false
},
"enableShareableLink": {
"value": false
},
Comment thread
ahmadabdalla marked this conversation as resolved.
"roleAssignments": {
"value": [
{
Expand Down
46 changes: 35 additions & 11 deletions modules/Microsoft.Network/bastionHosts/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,18 @@ param lock string = ''
@description('Optional. The SKU of this Bastion Host.')
param skuType string = 'Basic'

@description('Optional. Choose to disable or enable Copy Paste.')
param disableCopyPaste bool = false

@description('Optional. Choose to disable or enable File Copy.')
param enableFileCopy bool = true

@description('Optional. Choose to disable or enable IP Connect.')
param enableIpConnect bool = false

@description('Optional. Choose to disable or enable Shareable Link.')
param enableShareableLink bool = false

@description('Optional. The scale units for the Bastion Host resource.')
param scaleUnits int = 2

Expand Down Expand Up @@ -80,6 +92,8 @@ var diagnosticsLogs = [for category in diagnosticLogCategoriesToEnable: {
}
}]

var enableTunneling = skuType == 'Standard' ? true : null

var scaleUnits_var = skuType == 'Basic' ? 2 : scaleUnits

// ----------------------------------------------------------------------------
Expand All @@ -104,12 +118,12 @@ var newPip = {
}

var ipConfigurations = [
{
name: 'IpConfAzureBastionSubnet'
//Use existing public ip, new public ip created in this module, or none if isCreateDefaultPublicIP is false
properties: union(subnet_var, !empty(azureBastionSubnetPublicIpId) ? existingPip : {}, (isCreateDefaultPublicIP ? newPip : {}))
}
]
{
name: 'IpConfAzureBastionSubnet'
//Use existing public ip, new public ip created in this module, or none if isCreateDefaultPublicIP is false
properties: union(subnet_var, !empty(azureBastionSubnetPublicIpId) ? existingPip : {}, (isCreateDefaultPublicIP ? newPip : {}))
}
]

// ----------------------------------------------------------------------------

Expand Down Expand Up @@ -156,17 +170,27 @@ module publicIPAddress '../publicIPAddresses/deploy.bicep' = if (empty(azureBast
}
}

resource azureBastion 'Microsoft.Network/bastionHosts@2021-08-01' = {
var bastionproperties_var = skuType == 'Standard' ? {
scaleUnits: scaleUnits_var
ipConfigurations: ipConfigurations
enableTunneling: enableTunneling
disableCopyPaste: disableCopyPaste
enableFileCopy: enableFileCopy
enableIpConnect: enableIpConnect
enableShareableLink: enableShareableLink
} : {
scaleUnits: scaleUnits_var
ipConfigurations: ipConfigurations
}

resource azureBastion 'Microsoft.Network/bastionHosts@2022-01-01' = {
name: name
location: location
tags: tags
sku: {
name: skuType
}
properties: {
scaleUnits: scaleUnits_var
ipConfigurations: ipConfigurations
}
properties: bastionproperties_var
}

resource azureBastion_lock 'Microsoft.Authorization/locks@2017-04-01' = if (!empty(lock)) {
Expand Down
22 changes: 21 additions & 1 deletion modules/Microsoft.Network/bastionHosts/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This module deploys a bastion host.
| `Microsoft.Authorization/locks` | [2017-04-01](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) |
| `Microsoft.Authorization/roleAssignments` | [2022-04-01](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments) |
| `Microsoft.Insights/diagnosticSettings` | [2021-05-01-preview](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) |
| `Microsoft.Network/bastionHosts` | [2021-08-01](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-08-01/bastionHosts) |
| `Microsoft.Network/bastionHosts` | [2022-01-01](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2022-01-01/bastionHosts) |
| `Microsoft.Network/publicIPAddresses` | [2021-08-01](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-08-01/publicIPAddresses) |

## Parameters
Expand All @@ -39,7 +39,11 @@ This module deploys a bastion host.
| `diagnosticSettingsName` | string | `[format('{0}-diagnosticSettings', parameters('name'))]` | | The name of the diagnostic setting, if deployed. |
| `diagnosticStorageAccountId` | string | `''` | | Resource ID of the diagnostic storage account. |
| `diagnosticWorkspaceId` | string | `''` | | Resource ID of the diagnostic log analytics workspace. |
| `disableCopyPaste` | bool | `False` | | Choose to disable or enable Copy Paste. |
| `enableDefaultTelemetry` | bool | `True` | | Enable telemetry via the Customer Usage Attribution ID (GUID). |
| `enableFileCopy` | bool | `True` | | Choose to disable or enable File Copy. |
| `enableIpConnect` | bool | `False` | | Choose to disable or enable IP Connect. |
| `enableShareableLink` | bool | `False` | | Choose to disable or enable Shareable Link. |
| `isCreateDefaultPublicIP` | bool | `True` | | Specifies if a public ip should be created by default if one is not provided. |
| `location` | string | `[resourceGroup().location]` | | Location for all resources. |
| `lock` | string | `''` | `['', CanNotDelete, ReadOnly]` | Specify the type of lock. |
Expand Down Expand Up @@ -451,6 +455,10 @@ module bastionHosts './Microsoft.Network/bastionHosts/deploy.bicep' = {
diagnosticLogsRetentionInDays: 7
diagnosticStorageAccountId: '/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<<namePrefix>>azsax001'
diagnosticWorkspaceId: '/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001'
disableCopyPaste: true
enableFileCopy: false
enableIpConnect: false
enableShareableLink: false
lock: 'CanNotDelete'
roleAssignments: [
{
Expand Down Expand Up @@ -504,6 +512,18 @@ module bastionHosts './Microsoft.Network/bastionHosts/deploy.bicep' = {
"diagnosticWorkspaceId": {
"value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-001"
},
"disableCopyPaste": {
"value": true
},
"enableFileCopy": {
"value": false
},
"enableIpConnect": {
"value": false
},
"enableShareableLink": {
"value": false
},
"lock": {
"value": "CanNotDelete"
},
Expand Down