Skip to content

[Modules/Utilities] Migrated PE from AVM + enabled UDT for nested resources #4109

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
AlexanderSehr merged 13 commits into from
Oct 19, 2023
Merged

[Modules/Utilities] Migrated PE from AVM + enabled UDT for nested resources #4109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ad01c72
Migrated PE from AVM + enabled UDT for nested resources
AlexanderSehr Oct 18, 2023
f08ea2b
Re-added version.json
AlexanderSehr Oct 18, 2023
bf91a21
Updated PE ref
AlexanderSehr Oct 18, 2023
2328640
Updated more tests and added rule suppresion
AlexanderSehr Oct 18, 2023
aee90bb
Updated remaining tests
AlexanderSehr Oct 18, 2023
8622877
Moved paths
AlexanderSehr Oct 18, 2023
df30945
Regenerated all readmes
AlexanderSehr Oct 18, 2023
7c2d280
Small lock update
AlexanderSehr Oct 18, 2023
27f1b37
Adjusted how hash is detected
AlexanderSehr Oct 18, 2023
363f9c3
Update to latest
AlexanderSehr Oct 18, 2023
6865301
Added removed telemetry
AlexanderSehr Oct 18, 2023
878be7e
Update to latest
AlexanderSehr Oct 18, 2023
534807f
Regenerated templates & updated default lock logic
AlexanderSehr Oct 19, 2023
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
3 changes: 3 additions & 0 deletions bicepconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"rules": {
"explicit-values-for-loc-params": {
"level": "off" // Reason: Our modules default to e.g. the location of their parent resource group which is sufficient if deploying a self-contained solution
},
"no-deployments-resources": {
"level": "off" // Reason: The telemetry resource only has a single output and is self-contained in a deployment
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion modules/app-configuration/configuration-store/.test/pe/dependencies.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ resource privateDNSZone 'Microsoft.Network/privateDnsZones@2020-06-01' = {
output subnetResourceId string = virtualNetwork.properties.subnets[0].id

@description('The resource ID of the created Private DNS Zone.')
output privateDNSResourceId string = privateDNSZone.id
output privateDNSZoneResourceId string = privateDNSZone.id
2 changes: 1 addition & 1 deletion modules/app-configuration/configuration-store/.test/pe/main.test.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ module testDeployment '../../main.bicep' = {
{
privateDnsZoneGroup: {
privateDNSResourceIds: [
nestedDependencies.outputs.privateDNSResourceId
nestedDependencies.outputs.privateDNSZoneResourceId
]
}
service: 'configurationStores'
Expand Down
4 changes: 2 additions & 2 deletions modules/app-configuration/configuration-store/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ module configurationStore 'br:bicep/modules/app-configuration.configuration-stor
{
privateDnsZoneGroup: {
privateDNSResourceIds: [
'<privateDNSResourceId>'
'<privateDNSZoneResourceId>'
]
}
service: 'configurationStores'
Expand Down Expand Up @@ -469,7 +469,7 @@ module configurationStore 'br:bicep/modules/app-configuration.configuration-stor
{
"privateDnsZoneGroup": {
"privateDNSResourceIds": [
"<privateDNSResourceId>"
"<privateDNSZoneResourceId>"
]
},
"service": "configurationStores",
Expand Down
7 changes: 4 additions & 3 deletions modules/app-configuration/configuration-store/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,14 +250,15 @@ module configurationStore_privateEndpoints '../../network/private-endpoint/main.
subnetResourceId: privateEndpoint.subnetResourceId
enableDefaultTelemetry: enableReferencedModulesTelemetry
location: contains(privateEndpoint, 'location') ? privateEndpoint.location : reference(split(privateEndpoint.subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location
lock: contains(privateEndpoint, 'lock') ? privateEndpoint.lock : lock
privateDnsZoneGroup: contains(privateEndpoint, 'privateDnsZoneGroup') ? privateEndpoint.privateDnsZoneGroup : {}
lock: contains(privateEndpoint, 'lock') ? privateEndpoint.lock : null
privateDnsZoneGroupName: contains(privateEndpoint, 'privateDnsZoneGroupName') ? privateEndpoint.privateDnsZoneGroupName : 'default'
privateDnsZoneResourceIds: contains(privateEndpoint, 'privateDnsZoneResourceIds') ? privateEndpoint.privateDnsZoneResourceIds : []
roleAssignments: contains(privateEndpoint, 'roleAssignments') ? privateEndpoint.roleAssignments : []
tags: contains(privateEndpoint, 'tags') ? privateEndpoint.tags : {}
manualPrivateLinkServiceConnections: contains(privateEndpoint, 'manualPrivateLinkServiceConnections') ? privateEndpoint.manualPrivateLinkServiceConnections : []
customDnsConfigs: contains(privateEndpoint, 'customDnsConfigs') ? privateEndpoint.customDnsConfigs : []
ipConfigurations: contains(privateEndpoint, 'ipConfigurations') ? privateEndpoint.ipConfigurations : []
applicationSecurityGroups: contains(privateEndpoint, 'applicationSecurityGroups') ? privateEndpoint.applicationSecurityGroups : []
applicationSecurityGroupResourceIds: contains(privateEndpoint, 'applicationSecurityGroupResourceIds') ? privateEndpoint.applicationSecurityGroupResourceIds : []
customNetworkInterfaceName: contains(privateEndpoint, 'customNetworkInterfaceName') ? privateEndpoint.customNetworkInterfaceName : ''
}
}]
Expand Down
419 changes: 191 additions & 228 deletions modules/app-configuration/configuration-store/main.json
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 6 additions & 10 deletions modules/automation/automation-account/.test/common/main.test.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,9 @@ module testDeployment '../../main.bicep' = {
]
privateEndpoints: [
{
privateDnsZoneGroup: {
privateDNSResourceIds: [
nestedDependencies.outputs.privateDNSZoneResourceId
]
}
privateDnsZoneResourceIds: [
nestedDependencies.outputs.privateDNSZoneResourceId
]
service: 'Webhook'
subnetResourceId: nestedDependencies.outputs.subnetResourceId
tags: {
Expand All @@ -111,11 +109,9 @@ module testDeployment '../../main.bicep' = {
}
}
{
privateDnsZoneGroup: {
privateDNSResourceIds: [
nestedDependencies.outputs.privateDNSZoneResourceId
]
}
privateDnsZoneResourceIds: [
nestedDependencies.outputs.privateDNSZoneResourceId
]
service: 'DSCAndHybridWorker'
subnetResourceId: nestedDependencies.outputs.subnetResourceId
tags: {
Expand Down
32 changes: 12 additions & 20 deletions modules/automation/automation-account/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,9 @@ module automationAccount 'br:bicep/modules/automation.automation-account:1.0.0'
]
privateEndpoints: [
{
privateDnsZoneGroup: {
privateDNSResourceIds: [
'<privateDNSZoneResourceId>'
]
}
privateDnsZoneResourceIds: [
'<privateDNSZoneResourceId>'
]
service: 'Webhook'
subnetResourceId: '<subnetResourceId>'
tags: {
Expand All @@ -101,11 +99,9 @@ module automationAccount 'br:bicep/modules/automation.automation-account:1.0.0'
}
}
{
privateDnsZoneGroup: {
privateDNSResourceIds: [
'<privateDNSZoneResourceId>'
]
}
privateDnsZoneResourceIds: [
'<privateDNSZoneResourceId>'
]
service: 'DSCAndHybridWorker'
subnetResourceId: '<subnetResourceId>'
tags: {
Expand Down Expand Up @@ -312,11 +308,9 @@ module automationAccount 'br:bicep/modules/automation.automation-account:1.0.0'
"privateEndpoints": {
"value": [
{
"privateDnsZoneGroup": {
"privateDNSResourceIds": [
"<privateDNSZoneResourceId>"
]
},
"privateDnsZoneResourceIds": [
"<privateDNSZoneResourceId>"
],
"service": "Webhook",
"subnetResourceId": "<subnetResourceId>",
"tags": {
Expand All @@ -326,11 +320,9 @@ module automationAccount 'br:bicep/modules/automation.automation-account:1.0.0'
}
},
{
"privateDnsZoneGroup": {
"privateDNSResourceIds": [
"<privateDNSZoneResourceId>"
]
},
"privateDnsZoneResourceIds": [
"<privateDNSZoneResourceId>"
],
"service": "DSCAndHybridWorker",
"subnetResourceId": "<subnetResourceId>",
"tags": {
Expand Down
7 changes: 4 additions & 3 deletions modules/automation/automation-account/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,14 +381,15 @@ module automationAccount_privateEndpoints '../../network/private-endpoint/main.b
subnetResourceId: privateEndpoint.subnetResourceId
enableDefaultTelemetry: enableReferencedModulesTelemetry
location: contains(privateEndpoint, 'location') ? privateEndpoint.location : reference(split(privateEndpoint.subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location
lock: contains(privateEndpoint, 'lock') ? privateEndpoint.lock : lock
privateDnsZoneGroup: contains(privateEndpoint, 'privateDnsZoneGroup') ? privateEndpoint.privateDnsZoneGroup : {}
lock: contains(privateEndpoint, 'lock') ? privateEndpoint.lock : null
privateDnsZoneGroupName: contains(privateEndpoint, 'privateDnsZoneGroupName') ? privateEndpoint.privateDnsZoneGroupName : 'default'
privateDnsZoneResourceIds: contains(privateEndpoint, 'privateDnsZoneResourceIds') ? privateEndpoint.privateDnsZoneResourceIds : []
roleAssignments: contains(privateEndpoint, 'roleAssignments') ? privateEndpoint.roleAssignments : []
tags: contains(privateEndpoint, 'tags') ? privateEndpoint.tags : {}
manualPrivateLinkServiceConnections: contains(privateEndpoint, 'manualPrivateLinkServiceConnections') ? privateEndpoint.manualPrivateLinkServiceConnections : []
customDnsConfigs: contains(privateEndpoint, 'customDnsConfigs') ? privateEndpoint.customDnsConfigs : []
ipConfigurations: contains(privateEndpoint, 'ipConfigurations') ? privateEndpoint.ipConfigurations : []
applicationSecurityGroups: contains(privateEndpoint, 'applicationSecurityGroups') ? privateEndpoint.applicationSecurityGroups : []
applicationSecurityGroupResourceIds: contains(privateEndpoint, 'applicationSecurityGroupResourceIds') ? privateEndpoint.applicationSecurityGroupResourceIds : []
customNetworkInterfaceName: contains(privateEndpoint, 'customNetworkInterfaceName') ? privateEndpoint.customNetworkInterfaceName : ''
}
}]
Expand Down
Loading