-
Notifications
You must be signed in to change notification settings - Fork 437
[Modules] Service bus private networking ACL #1453
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.
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
MariusStorhaug
merged 41 commits into
Azure:main
from
ChrisSidebotham:service-bus-private-networking
Jul 7, 2022
Merged
Changes from all commits
Commits
Show all changes
41 commits
Select commit
Hold shift + click to select a range
440e6c0
Added ACL Config based on private endpoint config
ChrisSidebotham 2876da4
Static Validation Config
ChrisSidebotham fd641ab
Added trailing '.'
ChrisSidebotham 94469ef
updated metadata descriptions
ChrisSidebotham c1a2fc0
updated default ruleset param
ChrisSidebotham f9e4610
Replaced Globals for PR
ChrisSidebotham dc53461
Merge branch 'main' into service-bus-private-networking
ChrisSidebotham 46ebf09
removed whitespace
ChrisSidebotham 6d4a446
Applied suggestions from @eriqua
ChrisSidebotham 6ca5b3e
Added param for Azure Trusted Services
ChrisSidebotham ae572b7
updated readme to matech changes in #6d4a446
ChrisSidebotham cea8697
Updated version following new param addition
ChrisSidebotham 3c69a58
Apply suggestions from Marius code review
ChrisSidebotham 4ec874e
Apply suggestions from Marius code review
ChrisSidebotham 134230a
Update arm/Microsoft.ServiceBus/namespaces/networkRuleSets/readme.md
ChrisSidebotham 1422c0a
Update arm/Microsoft.ServiceBus/namespaces/readme.md
ChrisSidebotham 286048d
Updated default network rule set & param overide
ChrisSidebotham 2d60826
Updated vars for test
ChrisSidebotham 6f7ea1e
Merge branch 'Azure:main' into cs/service-bus-v2-Test
ChrisSidebotham 7fc4965
updated param name
ChrisSidebotham 099d86e
Updated params to match networkAclConfig param
ChrisSidebotham 7ed7594
Merge branch 'main' into service-bus-private-networking
cb24788
Set secure defaults & overide
ChrisSidebotham 3664e86
updated param trustedServiceAccessEnabled
ChrisSidebotham f4a072b
Fixed broken param trustedServiceAccessEnabled
ChrisSidebotham 79138e0
UPdated deployment files
ChrisSidebotham e41d128
Updated for networkRuleSets object param & readme updates
ChrisSidebotham 354ac38
removed unused param from param file
ChrisSidebotham 67eb8dd
Updated param description
ChrisSidebotham fe20d98
updated readme.md
ChrisSidebotham f86ba6d
merge of secure defaults & param overide
ChrisSidebotham 11e70d1
Updated params on child module per request from Erika
ChrisSidebotham c673387
Merge branch 'main' into service-bus-private-networking
ChrisSidebotham 1e2c901
Moved from ARM to modules due to Breaking change
ChrisSidebotham fe623dc
Updated version.json
ChrisSidebotham deb5351
Updated friendly resource name
ChrisSidebotham b1b9558
Update condition on nsr deployments
ChrisSidebotham 8a8b24b
Update params template
ChrisSidebotham 2b286cf
fixed json formatting
ChrisSidebotham d741873
Adding param for reinforced telemetry
ChrisSidebotham ed7cf76
Updated readme.md file for module
ChrisSidebotham File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
modules/Microsoft.ServiceBus/namespaces/networkRuleSets/deploy.bicep
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| @description('Conditional. The name of the parent Service Bus Namespace for the Service Bus Network Rule Set. Required if the template is used in a standalone deployment.') | ||
| @minLength(6) | ||
| @maxLength(50) | ||
| param namespaceName string | ||
|
|
||
| @description('Required. The default is the only valid ruleset.') | ||
| param name string = 'default' | ||
|
|
||
| @description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') | ||
| param enableDefaultTelemetry bool = true | ||
|
|
||
| @description('Required. Configure default action in virtual network rule set.') | ||
| param defaultAction string | ||
|
|
||
| @description('Required. Configure Publice Network Access restrictions in virtual network rule set.') | ||
| param publicNetworkAccess string | ||
|
|
||
| @description('Required. Configure Trusted Services in virtual network rule set.') | ||
| param trustedServiceAccessEnabled bool | ||
|
|
||
| @description('Optional. Configure IpFilter rules in virtual network rule set.') | ||
| param ipRules array = [] | ||
|
|
||
| @description('Optional. Configure Virtual Network Rules in virtual network rule set.') | ||
| param virtualNetworkRules array = [] | ||
|
|
||
| resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { | ||
| name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' | ||
| properties: { | ||
| mode: 'Incremental' | ||
| template: { | ||
| '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' | ||
| contentVersion: '1.0.0.0' | ||
| resources: [] | ||
| } | ||
| } | ||
| } | ||
|
|
||
| resource namespace 'Microsoft.ServiceBus/namespaces@2021-06-01-preview' existing = { | ||
| name: namespaceName | ||
| } | ||
|
|
||
| resource networkRuleSet 'Microsoft.ServiceBus/namespaces/networkRuleSets@2021-11-01' = { | ||
| name: name | ||
| parent: namespace | ||
| properties: { | ||
| defaultAction: defaultAction | ||
| publicNetworkAccess: publicNetworkAccess | ||
| trustedServiceAccessEnabled: trustedServiceAccessEnabled | ||
| ipRules: ipRules | ||
| virtualNetworkRules: virtualNetworkRules | ||
| } | ||
| } | ||
|
|
||
| @description('The name of the virtual network rule set deployment.') | ||
| output name string = networkRuleSet.name | ||
|
|
||
| @description('The Resource ID of the virtual network rule set.') | ||
| output resourceId string = networkRuleSet.id | ||
|
|
||
| @description('The name of the Resource Group the virtual network rule set was created in.') | ||
| output resourceGroupName string = resourceGroup().name |
45 changes: 45 additions & 0 deletions
45
modules/Microsoft.ServiceBus/namespaces/networkRuleSets/readme.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| # ServiceBus Namespaces NetworkRuleSets `[Microsoft.ServiceBus/namespaces/networkRuleSets]` | ||
|
|
||
| This module deploys ServiceBus Namespaces NetworkRuleSets. | ||
|
|
||
| ## Navigation | ||
|
|
||
| - [Resource Types](#Resource-Types) | ||
| - [Parameters](#Parameters) | ||
| - [Outputs](#Outputs) | ||
|
|
||
| ## Resource Types | ||
|
|
||
| | Resource Type | API Version | | ||
| | :-- | :-- | | ||
| | `Microsoft.ServiceBus/namespaces/networkRuleSets` | [2021-11-01](https://docs.microsoft.com/en-us/azure/templates/Microsoft.ServiceBus/2021-11-01/namespaces/networkRuleSets) | | ||
|
|
||
| ## Parameters | ||
|
|
||
| **Required parameters** | ||
| | Parameter Name | Type | Default Value | Description | | ||
| | :-- | :-- | :-- | :-- | | ||
| | `defaultAction` | string | | Configure default action in virtual network rule set. | | ||
| | `name` | string | `'default'` | The default is the only valid ruleset. | | ||
| | `publicNetworkAccess` | string | | Configure Publice Network Access restrictions in virtual network rule set. | | ||
| | `trustedServiceAccessEnabled` | bool | | Configure Trusted Services in virtual network rule set. | | ||
|
|
||
| **Conditional parameters** | ||
| | Parameter Name | Type | Description | | ||
| | :-- | :-- | :-- | | ||
| | `namespaceName` | string | The name of the parent Service Bus Namespace for the Service Bus Network Rule Set. Required if the template is used in a standalone deployment. | | ||
|
|
||
| **Optional parameters** | ||
| | Parameter Name | Type | Default Value | Description | | ||
| | :-- | :-- | :-- | :-- | | ||
| | `enableDefaultTelemetry` | bool | `True` | Enable telemetry via the Customer Usage Attribution ID (GUID). | | ||
| | `ipRules` | array | `[]` | Configure IpFilter rules in virtual network rule set. | | ||
| | `virtualNetworkRules` | array | `[]` | Configure Virtual Network Rules in virtual network rule set. | | ||
|
|
||
| ## Outputs | ||
|
|
||
| | Output Name | Type | Description | | ||
| | :-- | :-- | :-- | | ||
| | `name` | string | The name of the virtual network rule set deployment. | | ||
| | `resourceGroupName` | string | The name of the Resource Group the virtual network rule set was created in. | | ||
| | `resourceId` | string | The Resource ID of the virtual network rule set. | |
4 changes: 4 additions & 0 deletions
4
modules/Microsoft.ServiceBus/namespaces/networkRuleSets/version.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| { | ||
| "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", | ||
| "version": "0.1" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.