Skip to content
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

feat: Update PE implementation in alignment to latest schema (4) #1091

Merged
merged 31 commits into from
Mar 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
c12dc1b
PE adjustments (#1070)
segraef Feb 25, 2024
3a2572a
Update to latest
AlexanderSehr Feb 25, 2024
f510b12
Several fixes
AlexanderSehr Feb 25, 2024
ef334ce
More updates
AlexanderSehr Feb 25, 2024
ad38957
Expanded tests
AlexanderSehr Feb 25, 2024
e11cbd9
Refreshed JSON
AlexanderSehr Feb 25, 2024
7989ce0
Update to latest
AlexanderSehr Feb 25, 2024
a96d94b
Added missing tryGet
AlexanderSehr Feb 25, 2024
54ba237
Updated site docs
AlexanderSehr Feb 25, 2024
080fa8e
Merged latest main
AlexanderSehr Feb 25, 2024
a2d88ab
Update to latest
AlexanderSehr Feb 25, 2024
3aa7a03
Update to latest
AlexanderSehr Feb 25, 2024
e3fefb6
Update to latest
AlexanderSehr Feb 25, 2024
ff0819c
Update to latest
AlexanderSehr Feb 25, 2024
6e8af04
Update to latest
AlexanderSehr Feb 25, 2024
b06858d
Fixed incorrect groupId for synapse privateLinkHub
AlexanderSehr Feb 25, 2024
e79edcb
feat: added additional PE tests (#1077)
segraef Feb 26, 2024
c867e8e
Update to latest
AlexanderSehr Feb 26, 2024
a98d5f6
Update to latest
AlexanderSehr Feb 26, 2024
ee1ceb9
Update to latest
AlexanderSehr Feb 26, 2024
b703187
Update to latest
AlexanderSehr Feb 26, 2024
b86b2db
Regen docs
AlexanderSehr Feb 26, 2024
47a42d4
Updated tests with explicit dependency
AlexanderSehr Feb 26, 2024
846b512
Added explicit dependencies
AlexanderSehr Feb 26, 2024
3befb25
Update to latest
AlexanderSehr Feb 26, 2024
8805574
Update to latest
AlexanderSehr Feb 26, 2024
b6dbfb9
Merge branch 'main' into feat/pe-adjustments-962-946-1042
AlexanderSehr Feb 27, 2024
63c7309
Update to latest
AlexanderSehr Feb 27, 2024
8336010
Update to latest
AlexanderSehr Feb 27, 2024
e142af4
Update to latest
AlexanderSehr Mar 8, 2024
16cf974
Merge branch 'main' into feat/pe-adjustments-962-946-1042_4
ChrisSidebotham Mar 8, 2024
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
102 changes: 97 additions & 5 deletions avm/res/storage/storage-account/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,48 @@ module storageAccount 'br/public:avm/res/storage/storage-account:<version>' = {
Role: 'DeploymentValidation'
}
}
{
privateDnsZoneResourceIds: [
'<privateDNSZoneResourceId>'
]
service: 'blob'
subnetResourceId: '<subnetResourceId>'
}
{
privateDnsZoneResourceIds: [
'<privateDNSZoneResourceId>'
]
service: 'table'
subnetResourceId: '<subnetResourceId>'
}
{
privateDnsZoneResourceIds: [
'<privateDNSZoneResourceId>'
]
service: 'queue'
subnetResourceId: '<subnetResourceId>'
}
{
privateDnsZoneResourceIds: [
'<privateDNSZoneResourceId>'
]
service: 'file'
subnetResourceId: '<subnetResourceId>'
}
{
privateDnsZoneResourceIds: [
'<privateDNSZoneResourceId>'
]
service: 'web'
subnetResourceId: '<subnetResourceId>'
}
{
privateDnsZoneResourceIds: [
'<privateDNSZoneResourceId>'
]
service: 'dfs'
subnetResourceId: '<subnetResourceId>'
}
]
queueServices: {
diagnosticSettings: [
Expand Down Expand Up @@ -841,6 +883,48 @@ module storageAccount 'br/public:avm/res/storage/storage-account:<version>' = {
"hidden-title": "This is visible in the resource name",
"Role": "DeploymentValidation"
}
},
{
"privateDnsZoneResourceIds": [
"<privateDNSZoneResourceId>"
],
"service": "blob",
"subnetResourceId": "<subnetResourceId>"
},
{
"privateDnsZoneResourceIds": [
"<privateDNSZoneResourceId>"
],
"service": "table",
"subnetResourceId": "<subnetResourceId>"
},
{
"privateDnsZoneResourceIds": [
"<privateDNSZoneResourceId>"
],
"service": "queue",
"subnetResourceId": "<subnetResourceId>"
},
{
"privateDnsZoneResourceIds": [
"<privateDNSZoneResourceId>"
],
"service": "file",
"subnetResourceId": "<subnetResourceId>"
},
{
"privateDnsZoneResourceIds": [
"<privateDNSZoneResourceId>"
],
"service": "web",
"subnetResourceId": "<subnetResourceId>"
},
{
"privateDnsZoneResourceIds": [
"<privateDNSZoneResourceId>"
],
"service": "dfs",
"subnetResourceId": "<subnetResourceId>"
}
]
},
Expand Down Expand Up @@ -2544,9 +2628,10 @@ Configuration details for private endpoints. For security reasons, it is recomme
| [`customNetworkInterfaceName`](#parameter-privateendpointscustomnetworkinterfacename) | string | The custom name of the network interface attached to the private endpoint. |
| [`enableTelemetry`](#parameter-privateendpointsenabletelemetry) | bool | Enable/Disable usage telemetry for module. |
| [`ipConfigurations`](#parameter-privateendpointsipconfigurations) | array | A list of IP configurations of the private endpoint. This will be used to map to the First Party Service endpoints. |
| [`isManualConnection`](#parameter-privateendpointsismanualconnection) | bool | Manual PrivateLink Service Connections. |
| [`location`](#parameter-privateendpointslocation) | string | The location to deploy the private endpoint to. |
| [`lock`](#parameter-privateendpointslock) | object | Specify the type of lock. |
| [`manualPrivateLinkServiceConnections`](#parameter-privateendpointsmanualprivatelinkserviceconnections) | array | Manual PrivateLink Service Connections. |
| [`manualConnectionRequestMessage`](#parameter-privateendpointsmanualconnectionrequestmessage) | string | A message passed to the owner of the remote resource with the manual connection request. |
| [`name`](#parameter-privateendpointsname) | string | The name of the private endpoint. |
| [`privateDnsZoneGroupName`](#parameter-privateendpointsprivatednszonegroupname) | string | The name of the private DNS zone group to create if privateDnsZoneResourceIds were provided. |
| [`privateDnsZoneResourceIds`](#parameter-privateendpointsprivatednszoneresourceids) | array | The private DNS zone groups to associate the private endpoint with. A DNS zone group can support up to 5 DNS zones. |
Expand Down Expand Up @@ -2673,6 +2758,13 @@ A private ip address obtained from the private endpoint's subnet.
- Required: Yes
- Type: string

### Parameter: `privateEndpoints.isManualConnection`

Manual PrivateLink Service Connections.

- Required: No
- Type: bool

### Parameter: `privateEndpoints.location`

The location to deploy the private endpoint to.
Expand Down Expand Up @@ -2716,12 +2808,12 @@ Specify the name of lock.
- Required: No
- Type: string

### Parameter: `privateEndpoints.manualPrivateLinkServiceConnections`
### Parameter: `privateEndpoints.manualConnectionRequestMessage`

Manual PrivateLink Service Connections.
A message passed to the owner of the remote resource with the manual connection request.

- Required: No
- Type: array
- Type: string

### Parameter: `privateEndpoints.name`

Expand Down Expand Up @@ -3031,7 +3123,7 @@ This section gives you an overview of all local-referenced module files (i.e., o

| Reference | Type |
| :-- | :-- |
| `br/public:avm/res/network/private-endpoint:0.3.1` | Remote reference |
| `br/public:avm/res/network/private-endpoint:0.4.0` | Remote reference |

## Notes

Expand Down
33 changes: 24 additions & 9 deletions avm/res/storage/storage-account/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -353,21 +353,33 @@ resource storageAccount_roleAssignments 'Microsoft.Authorization/roleAssignments
scope: storageAccount
}]

module storageAccount_privateEndpoints 'br/public:avm/res/network/private-endpoint:0.3.1' = [for (privateEndpoint, index) in (privateEndpoints ?? []): {
module storageAccount_privateEndpoints 'br/public:avm/res/network/private-endpoint:0.4.0' = [for (privateEndpoint, index) in (privateEndpoints ?? []): {
name: '${uniqueString(deployment().name, location)}-StorageAccount-PrivateEndpoint-${index}'
params: {
privateLinkServiceConnections: [
name: privateEndpoint.?name ?? 'pep-${last(split(storageAccount.id, '/'))}-${privateEndpoint.service}-${index}'
privateLinkServiceConnections: privateEndpoint.?manualPrivateLinkServiceConnections != true ? [
{
name: name
name: privateEndpoint.?privateLinkServiceConnectionName ?? '${last(split(storageAccount.id, '/'))}-${privateEndpoint.service}-${index}'
properties: {
privateLinkServiceId: storageAccount.id
groupIds: [
privateEndpoint.service
]
}
}
]
name: privateEndpoint.?name ?? 'pep-${last(split(storageAccount.id, '/'))}-${privateEndpoint.service}-${index}'
] : null
manualPrivateLinkServiceConnections: privateEndpoint.?manualPrivateLinkServiceConnections == true ? [
{
name: privateEndpoint.?privateLinkServiceConnectionName ?? '${last(split(storageAccount.id, '/'))}-${privateEndpoint.service}-${index}'
properties: {
privateLinkServiceId: storageAccount.id
groupIds: [
privateEndpoint.service
]
requestMessage: privateEndpoint.?manualConnectionRequestMessage ?? 'Manual approval required.'
}
}
] : null
subnetResourceId: privateEndpoint.subnetResourceId
enableTelemetry: privateEndpoint.?enableTelemetry ?? enableTelemetry
location: privateEndpoint.?location ?? reference(split(privateEndpoint.subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location
Expand All @@ -376,7 +388,6 @@ module storageAccount_privateEndpoints 'br/public:avm/res/network/private-endpoi
privateDnsZoneResourceIds: privateEndpoint.?privateDnsZoneResourceIds
roleAssignments: privateEndpoint.?roleAssignments
tags: privateEndpoint.?tags ?? tags
manualPrivateLinkServiceConnections: privateEndpoint.?manualPrivateLinkServiceConnections
customDnsConfigs: privateEndpoint.?customDnsConfigs
ipConfigurations: privateEndpoint.?ipConfigurations
applicationSecurityGroupResourceIds: privateEndpoint.?applicationSecurityGroupResourceIds
Expand Down Expand Up @@ -571,6 +582,13 @@ type privateEndpointType = {
@description('Optional. The private DNS zone groups to associate the private endpoint with. A DNS zone group can support up to 5 DNS zones.')
privateDnsZoneResourceIds: string[]?

@description('Optional. Manual PrivateLink Service Connections.')
isManualConnection: bool?

@description('Optional. A message passed to the owner of the remote resource with the manual connection request.')
@maxLength(140)
manualConnectionRequestMessage: string?

@description('Optional. Custom DNS configurations.')
customDnsConfigs: {
@description('Required. Fqdn that resolves to private endpoint ip address.')
Expand Down Expand Up @@ -613,9 +631,6 @@ type privateEndpointType = {
@description('Optional. Tags to be applied on all resources/resource groups in this deployment.')
tags: object?

@description('Optional. Manual PrivateLink Service Connections.')
manualPrivateLinkServiceConnections: array?

@description('Optional. Enable/Disable usage telemetry for module.')
enableTelemetry: bool?
}[]?
Expand Down
Loading
Loading